Merge branch 'master' into security-master

changelog.html

@@ -1485,7 +1485,7 @@ Upcoming changes</a>
 <h3><a name=v1.563>What's new in 1.563</a> (2014/05/11)</h3>
 <ul class=image>
   <li class="major bug">
-    Memory exhausion in remoting channel since 1.560.
+    Memory exhaustion in remoting channel since 1.560.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22734">issue 22734</a>)
   <li class="rfe">
     Configurable size for log buffer.
@@ -1629,7 +1629,7 @@ Upcoming changes</a>
     Fixed NoSuchMethodException when destroying processes using JDK1.8.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21341">issue 21341</a>)
   <li class=rfe>
-    Avoid irrelevant job queing while node is offline.
+    Avoid irrelevant job queuing while node is offline.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21394">issue 21394</a>)
   <li class=rfe>
     Debian package now creates 'jenkins' group

test/src/test/java/jenkins/model/JenkinsLocationConfigurationTest.java

 package jenkins.model;
 
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -24,6 +25,6 @@ public class JenkinsLocationConfigurationTest {
         HtmlPage p = j.createWebClient().goTo("configure");
         HtmlInput url = p.getFormByName("config").getInputByName("_.url");
         url.setValueAttribute("http://localhost:1234/");
-        assertTrue(p.getDocumentElement().getTextContent().contains("instead of localhost"));
+        assertThat(p.getDocumentElement().getTextContent(), containsString("instead of localhost"));
     }
 }

war/pom.xml

@@ -97,7 +97,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>instance-identity</artifactId>
-      <version>1.4</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>