Merge branch 'master' into BlockedBecauseOfBuildInProgress

Conflicts:
	core/src/main/resources/hudson/model/Messages.properties
	core/src/main/resources/hudson/model/Messages_de.properties
	core/src/main/resources/hudson/model/Messages_it.properties
	core/src/main/resources/hudson/model/Messages_ja.properties
	core/src/main/resources/hudson/model/Messages_zh_TW.properties
	core/src/main/resources/jenkins/model/Messages.properties
	core/src/main/resources/jenkins/model/Messages_da.properties
	core/src/main/resources/jenkins/model/Messages_de.properties
	core/src/main/resources/jenkins/model/Messages_es.properties
	core/src/main/resources/jenkins/model/Messages_fr.properties
	core/src/main/resources/jenkins/model/Messages_it.properties
	core/src/main/resources/jenkins/model/Messages_ja.properties
	core/src/main/resources/jenkins/model/Messages_nl.properties
	core/src/main/resources/jenkins/model/Messages_pt_BR.properties
	core/src/main/resources/jenkins/model/Messages_ru.properties
	core/src/main/resources/jenkins/model/Messages_tr.properties
	core/src/main/resources/jenkins/model/Messages_zh_CN.properties
	core/src/main/resources/jenkins/model/Messages_zh_TW.properties