Merge branch 'master' into xmlunit

Author: krisstern

core/src/main/resources/jenkins/install/platform-plugins.json

@@ -80,7 +80,7 @@
     "category": "User Management and Security",
     "plugins": [
       { "name": "matrix-auth", "suggested": true },
-      { "name": "pam-auth", "suggested": true },
+      { "name": "pam-auth" },
       { "name": "ldap", "suggested": true },
       { "name": "role-strategy" },
       { "name": "active-directory" }

test/pom.xml

@@ -100,7 +100,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>bouncycastle-api</artifactId>
-        <version>2.30.1.80-256.vf98926042a_9b_</version>
+        <version>2.30.1.80-261.v00c0e2618ec3</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps via mailer and junit -->
@@ -183,7 +183,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2447.v8a_ce9e0fca_32</version>
+      <version>2451.v7538d021657d</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

war/pom.xml

@@ -435,7 +435,7 @@ THE SOFTWARE.
                   <!-- detached after 2.16 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>bouncycastle-api</artifactId>
-                  <version>2.30.1.80-256.vf98926042a_9b_</version>
+                  <version>2.30.1.80-261.v00c0e2618ec3</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>