(cherry picked from commit e4c5c710)

Ugly hack to fix destroyProcess for Java8

(cherry picked from commit 19640e7b)

Integrated the new version of XStream that contains the fix.

(cherry picked from commit 585eb87c)

Conflicts:
	changelog.html

This is already handled by ListView.Listener (other kinds of views are now responsible for their own listeners).
And handled better—if there are no actual changes
(because you have no such views, or they do not mention this job), there is no need to save.
Also moving the actual saving in those remaining cases out of the lock on the ListView itself, just in case.

[JENKINS-21984] Disabling cert check on updateDirectlyWithJson since the certificate is now expired, and it is no good to have a test which is known to start failing at a particular time in the future!

Not currently working: https://netbeans.org/bugzilla/show_bug.cgi?id=242428

Introduce VirtualFile.run method to batch together commands.
This should restore pre-ArtifactManager performance for workspace browsing.

[FIXED JENKINS-21780] Revised fix to make cache work properly without introducing a new remote call to find hash codes.

[FIXED JENKINS-21855] Add preview for parameter descriptions

[FIXED JENKINS-21958] FilePath.copyRecursiveTo given a scanner including a symlink but not any regular file in the same directory would neglect to create the parent directory on the destination and thus not copy the link.
(Util.createSymlink is partly to blame for not throwing a descriptive IOException when it fails to create a link,
but this is its historical behavior needed for compatibility.
copyRecursiveTo also continues to suppress error text from this method because there is nowhere for it to go.
Perhaps need a new variant of createSymlink that is guaranteed to either have created the link or throw an exception.)

Seems to work in 8.0 at least for some functional tests.
Developers can always disable it privately if they run into issues.

fixed i18n issue for Chinese(zh_CN): remove 查克·诺里斯说

fixed i18n issue for Chinese(zh_CN): remove 查克·诺里斯说 ( "\u67E5\u514B\u00B7\u8BFA\u91CC\u65AF\u8BF4\uFF1A" )  from *.zh_CN.properties

merge from jenkins trunk

... based on Tyler's discovery at https://gist.github.com/rtyler/9195510

testRemoting(hudson.util.ProcessTreeTest)  Time elapsed: 0.097 sec  <<< ERROR!
java.util.NoSuchElementException: null
        at java.util.HashMap$HashIterator.nextEntry(HashMap.java:897)
        at java.util.HashMap$ValueIterator.next(HashMap.java:922)
        at hudson.util.ProcessTreeTest$MyCallable.call(ProcessTreeTest.java:42)
        at hudson.util.ProcessTreeTest$MyCallable.call(ProcessTreeTest.java:38)
        at hudson.remoting.UserRequest.perform(UserRequest.java:118)
        at hudson.remoting.UserRequest.perform(UserRequest.java:48)
        at hudson.remoting.Request$2.run(Request.java:328)
        at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
        at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
        at java.util.concurrent.FutureTask.run(FutureTask.java:166)
        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
        at java.lang.Thread.run(Thread.java:724)

He runs this on FreeBSD.