Fix formatting of XML under comparison.

Conflicts:
	subprojects/ear/src/integTest/groovy/org/gradle/plugins/ear/EarPluginIntegrationTest.groovy
Remove extra space.
Temorarily ignore failing test on windows.

Needs investigation into whether the descriptor being written with windows line endings is a problem.
Clean up mess after bad commit cherry picking.