Merge branch 'master' into fix/client-cookie

Original commit: elastic/x-pack-elasticsearch@46a3305b2a

elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java

@@ -37,6 +37,6 @@ public class VersionCompatibilityTests extends ESTestCase {
          *
          */
         assertThat("Remove workaround in LicenseService class when es core supports merging cluster level custom metadata",
-                   Version.CURRENT.equals(Version.V_5_0_0), is(true));
+                   Version.CURRENT.equals(Version.V_5_0_0_alpha3), is(true));
     }
 }