Various improvements from code reviews
Merge branch 'master' of https://github.com/jenkinsci/jenkins
Update changelog, should have been updated with original merge in to 1.515
Merge pull request #774 from dnadolny/master

[JENKINS-17478] Various improvements from code reviews