Merge branch 'oss'

Conflicts:
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/model/AutoCompletionCandidates.java
	core/src/main/java/hudson/model/ViewDescriptor.java
	core/src/main/resources/lib/hudson/3rdPartyLicenses.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	core/src/main/resources/lib/hudson/projectViewRow.jelly
	core/src/main/resources/lib/hudson/thirdPartyLicenses.jelly
	core/src/main/resources/lib/layout/renderOnDemand.jelly
	core/src/test/java/hudson/FilePathTest.java
	test/src/test/resources/lib/layout/RenderOnDemandTest/testBehaviour.jelly
	test/src/test/resources/scripts/BehaviorTest/testCssSelectors.jelly
	ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/JavaScriptProxy/index.jelly