Conflicts:
	changelog.html

Modified to assume UTF-8 if we fail to find it.

future#isDone() potentially needs synchronized access (expensive), therefore use it as 2nd clause in the AND expression

Remove code duplication between Maven2 and Maven3 builders

[FIXED JENKINS-11209] clarify the notification sender email vs system adm

Connect and Disconnect permissions for slaves