Merge REMERGE_HEAD into HEAD

changelog.html

@@ -180,6 +180,9 @@ Upcoming changes</a>
   <li class="bug">
     Polling no longer triggers builds (regression 1.560)
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22750">issue 22750</a>)
+  <li class="bug">
+    Allow markup formatter to be selected without enabling security.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22028">issue 22028</a>)
 </ul>
 <h3><a name=v1.564>What's new in 1.564</a> (2014/05/19)</h3>
 <ul class=image>
@@ -192,9 +195,6 @@ Upcoming changes</a>
   <li class="bug">
     Fixed localization of build environment variable help.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22867">issue 22867</a>)
-  <li class="bug">
-    Allow markup formatter to be selected without enabling security.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22028">issue 22028</a>)
   <li class="bug">
     Update bundled Matrix project plugin to 1.2 fixing issues introduced in 1.561.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22879">issue 22879</a>,