Touch-ups for #914.
Merge REMERGE_HEAD into HEAD
Merge REMERGE_HEAD into HEAD
Merge branch 'master' into aggregate-test-result

Conflicts:
	changelog.html
Add @DataBoundConstructor to SleepBuilder along with test unit.
Merge pull request #943 from wolfs/aggregate-test-result

[FIXED JENKINS-9637] More Fixes for Aggregated Test Result
Merge branch 'master' of https://github.com/jenkinsci/jenkins
Add @DataBoundConstructor to SleepBuilder along with test unit.
buildEnvironmentFor job shouldn't override slave's environment with
master's
Check that Computer.currentComputer() is never called
inside buildEnvironmentFor Job since it doesn't make sense
outside of a running build.
[JENKINS-19447] JDK installation hangs forever
[JENKINS-8957] JDK installation influences already installed java instances
Update log-rotation_fr.html

fix faute de frappe
Merge pull request #948 from Batmat/fix-ypo

Update log-rotation_fr.html
Upgrade windows remote command to version 1.4
[JENKINS-19488] test for #938
Merge pull request #938 from vjuranek/vjuranek-JENKINS-19488
added logging
[JENKINS-5073]

Suppressed a confusing 2nd error message.
Typo.