maybe really fix line endings?!!!!
merge update-license-headers, deal with damn 2 files with bunk line endings
Conflicts:
	plugins/restlet1x/nexus-restlet-bridge/src/test/java/org/sonatype/plexus/rest/xstream/xml/InvalidXMLTest.java
	plugins/restlet1x/nexus-restlet-bridge/src/test/java/org/sonatype/plexus/rest/xstream/xml/SimpleTestObject.java