Merge remote-tracking branch 'origin/master' into JENKINS-37323

.gitignore

@@ -16,4 +16,5 @@ work
bin/

node/
node_modules/
node_modules/
npm-debug.log

pom.xml

@@ -22,8 +22,8 @@
  <properties>
    <!-- https://github.com/jenkinsci/acceptance-test-harness -->
    <jenkins.acceptance.testharness.version>1.30</jenkins.acceptance.testharness.version>
    <node.version>5.8.0</node.version>
    <npm.version>3.7.3</npm.version>
    <node.version>6.4.0</node.version>
    <npm.version>3.10.3</npm.version>
  </properties>

  <repositories>