Merge branch 'security' into security-rc

test/src/test/java/hudson/security/HudsonPrivateSecurityRealm2Test.java

@@ -58,7 +58,8 @@ public class HudsonPrivateSecurityRealm2Test {
         signup.enterEmail("alice@nowhere.com");
         HtmlPage success = signup.submit(rule);
         assertThat(success.getElementById("main-panel").getTextContent(), containsString("Success"));
-        assertThat(success.getElementById("login-field").getTextContent(), containsString("Alice User"));
+        assertThat(success.getAnchorByHref("/jenkins/user/alice").getTextContent(), containsString("Alice User"));
+
 
         assertEquals("Alice User", securityRealm.getUser("alice").getDisplayName());