Merge branch 'master' into jenkins-38152

Jenkinsfile

@@ -3,12 +3,12 @@
 pipeline {
     // Make sure that the tools we need are installed and on the path.
     tools {
-        maven "Maven 3.3.9"
-        jdk "Oracle JDK 8u40"
+        maven "mvn"
+        jdk "jdk8"
     }
 
-    // Run on any executor.
-    agent label:""
+    // Run on executors with the "docker" label, because it's either that or Windows here.
+    agent label:"docker"
 
     // The order that sections are specified doesn't matter - this will still be run
     // after the stages, even though it's specified before the stages.
@@ -21,25 +21,6 @@ pipeline {
         }
     }
 
-    // This will also run after the stages *and* after postBuild. Further improvements planned
-    // for the mail step (https://issues.jenkins-ci.org/browse/JENKINS-37869,
-    // https://issues.jenkins-ci.org/browse/JENKINS-37870 to start, more to come) and other
-    // notifier plugins to be more user-friendly.
-    notifications {
-        success {
-            mail to:"abayer@cloudbees.com", subject:"SUCCESS: ${currentBuild.fullDisplayName}", body: "Yay, we passed."
-        }
-        failure {
-            mail to:"abayer@cloudbees.com", subject:"FAILURE: ${currentBuild.fullDisplayName}", body: "Boo, we failed."
-        }
-        unstable {
-            mail to:"abayer@cloudbees.com", subject:"UNSTABLE: ${currentBuild.fullDisplayName}", body: "Huh, we're unstable."
-        }
-        changed {
-            mail to:"abayer@cloudbees.com", subject:"CHANGED: ${currentBuild.fullDisplayName}", body: "Wow, our status changed!"
-        }
-    }
-
     stages {
         // While there's only one stage here, you can specify as many stages as you like!
         stage("build") {