Merge branch 'master' of github.com:jenkinsci/jenkins

Conflicts:
	changelog.html

changelog.html

@@ -58,6 +58,9 @@ Upcoming changes</a>
   <li class=bug>
     Deadlock involving views.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15368">issue 15368</a>)
+  <li class='bug'>
+    Can't configure Maven Installations on Jenkins ver. 1.483, 1.484
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15293">issue 15293</a>)
   <li class='rfe'>
     Memory footprint improvement, especially under large HTTP request threads.
   <li class='major rfe'>