Merge branch 'master' of github.com:jenkinsci/jenkins

cli/src/main/resources/hudson/cli/client/Messages.properties

@@ -9,5 +9,5 @@ CLI.Usage=Jenkins CLI\n\
   The available commands depend on the server. Run the 'help' command to\n\
   see the list.
 CLI.NoURL=Neither -s nor the JENKINS_URL env var is specified.
-CLI.VersionMismatch=Version mismatch. This CLI cannot work with this Hudson server
+CLI.VersionMismatch=Version mismatch. This CLI cannot work with this Jenkins server.
 CLI.NoSuchFileExists=No such file exists: {0}