Merge branch 'master' into JENKINS-27256

* master:
  Updated changelog
  updated changelog as a part of the release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.604
  Noting #1597
  Noting #1593, #1579, move JENKINS-22346, #1558
  Remove two fixes that were backported to RC
  JENKINS-27183 Avoid deadlock when using build-monitor-plugin