[JENKINS-23966] Master labels disappear when system configuration is updated
Merge branch 'jenkins-23966' of https://github.com/dominiquebrice/jenkins
[FIXED JENKINS-23966] Merging #1474.
Missing @since.
Merge branch 'master' of git://github.com/jenkinsci/jenkins

Conflicts:
	changelog.html