Merge remote-tracking branch 'elastic/master' into feature/sql

Original commit: elastic/x-pack-elasticsearch@ecbfa82bcf

docs/build.gradle

@@ -76,7 +76,6 @@ buildRestTests.expectedUnconvertedCandidates = [
         'en/rest-api/ml/open-job.asciidoc',
         'en/rest-api/ml/preview-datafeed.asciidoc',
         'en/rest-api/ml/put-datafeed.asciidoc',
-        'en/rest-api/ml/put-job.asciidoc',
         'en/rest-api/ml/start-datafeed.asciidoc',
         'en/rest-api/ml/stop-datafeed.asciidoc',
         'en/rest-api/ml/update-datafeed.asciidoc',

docs/en/rest-api/ml/put-job.asciidoc

@@ -85,7 +85,6 @@ PUT _xpack/ml/anomaly_detectors/it-ops-kpi
 }
 --------------------------------------------------
 // CONSOLE
-// TEST[skip:todo]
 
 When the job is created, you receive the following results:
 [source,js]
@@ -110,6 +109,9 @@ When the job is created, you receive the following results:
     ],
     "influencers": []
   },
+  "analysis_limits": {
+    "model_memory_limit": "1024mb"
+  },
   "data_description": {
     "time_field": "@timestamp",
     "time_format": "epoch_ms"
@@ -118,3 +120,6 @@ When the job is created, you receive the following results:
   "results_index_name": "shared"
 }
 ----
+//CONSOLE
+//TESTRESPONSE[s/"job_version": "7.0.0-alpha1"/"job_version": $body.job_version/]
+//TESTRESPONSE[s/"create_time": 1502832478794/"create_time": $body.create_time/]

plugin/src/main/java/org/elasticsearch/xpack/security/authc/TokenMetaData.java

@@ -82,7 +82,7 @@ public final class TokenMetaData extends AbstractNamedDiffable<ClusterState.Cust
 
     @Override
     public Version getMinimalSupportedVersion() {
-        return Version.V_7_0_0_alpha1;
+        return Version.V_6_0_0_beta2;
     }
 
     @Override

plugin/src/main/java/org/elasticsearch/xpack/security/authc/TokenService.java

@@ -241,7 +241,7 @@ public final class TokenService extends AbstractComponent {
             } else {
                 final BytesKey decodedSalt = new BytesKey(in.readByteArray());
                 final BytesKey passphraseHash;
-                if (version.onOrAfter(Version.V_7_0_0_alpha1)) {
+                if (version.onOrAfter(Version.V_6_0_0_beta2)) {
                     passphraseHash = new BytesKey(in.readByteArray());
                 } else {
                     passphraseHash = keyCache.currentTokenKeyHash;

qa/rolling-upgrade/build.gradle

@@ -124,8 +124,6 @@ subprojects {
       setting 'xpack.security.transport.ssl.enabled', 'true'
       setting 'xpack.ssl.keystore.path', 'testnode.jks'
       setting 'xpack.ssl.keystore.password', 'testnode'
-      // this is needed until the token service changes are backported to 6.x
-      keystoreSetting 'xpack.security.authc.token.passphrase', 'xpack_token_passphrase'
       dependsOn copyTestNodeKeystore
       extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
       if (withSystemKey) {
@@ -162,7 +160,6 @@ subprojects {
       waitCondition = waitWithAuth
       setting 'xpack.ssl.keystore.path', 'testnode.jks'
       keystoreSetting 'xpack.ssl.keystore.secure_password', 'testnode'
-      keystoreSetting 'xpack.security.authc.token.passphrase', 'xpack_token_passphrase'
       setting 'node.attr.upgraded', 'first'
       dependsOn copyTestNodeKeystore
       extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
@@ -193,7 +190,6 @@ subprojects {
       waitCondition = waitWithAuth
       setting 'xpack.ssl.keystore.path', 'testnode.jks'
       keystoreSetting 'xpack.ssl.keystore.secure_password', 'testnode'
-      keystoreSetting 'xpack.security.authc.token.passphrase', 'xpack_token_passphrase'
       dependsOn copyTestNodeKeystore
       extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
       if (withSystemKey) {