This was the change suggested by Jesse.

Add logging for colliding resources

[FIXED JENKINS-18282] - Manipulate nodes via CLI

[FIXED JENKINS-17942] Break long values in property tables

[FIXED JENKINS-10184] wrong timestamps in build timeline.

I'm going to just merge this in for now and welcome anyone who finds the proper way to do this.

Add more control of Java heap and perm sizing on OSX and set defaults. 

Add tests for MyViewsProperty class

Tests for User class.

Add tests for MyViewTest class

[FIXED JENKINS-18196] Change to the estimated duratrion calculation to prevent performance issues with lazy build loading

Poll on the last existing workspace instead of the last workspace,

This helps resolving problems with resources.

Allow headless installs again

Since I don't think any other scripts depend on this one, I'm just giving it a low enough priority.

... with a test case. The fix is in Stapler.

Servers often want headless java to not install graphical packages
but the current depends force the install of non-headless java.

Now to check behavior in trunk.

[JENKINS-3265] [JENKINS-17341] Even if older plugins throw an NPE during reload, continue loading job.