update version to 1.7-SNAPSHOT
update some deps
normalize 2 space xml (yes I gave in)
Merge remote-tracking branch 'origin/master' into nxcm-4928-junit-411

Conflicts:
	litmus-testsupport/pom.xml
	pom.xml
Redone junit 4.11 in POMs