Merge branch '2.0' of github.com:jenkinsci/jenkins into JENKINS-14538

Conflicts:
	core/src/main/resources/hudson/model/Computer/sidepanel.jelly

core/src/main/java/hudson/Functions.java

@@ -1577,7 +1577,7 @@ public class Functions {
      * Obtains the host name of the Hudson server that clients can use to talk back to.
      * <p>
      * This is primarily used in <tt>slave-agent.jnlp.jelly</tt> to specify the destination
-     * that the slaves talk to.
+     * that the agents talk to.
      */
     public String getServerName() {
         // Try to infer this from the configured root URL.