Conflicts:
	core/pom.xml
	core/src/main/java/hudson/model/Node.java
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

Conflicts:
	core/src/main/resources/lib/form/optionalBlock.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

Conflicts:
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

Conflicts:
	changelog.html

- support invisible JobProperty

- simplifying Jelly view and submission handling

Tsk Tsk! Kohsuke you missed a possible NPE for people running hpi:run on plugins in fixing [JENKINS-6545]

refactor the save method so that it is available to all and null safe. also added a readResolve to handle when null properties are deserialized