Improved MANIFEST jar metadata.
Auto-fix of XML indents.
Refactored project dependencies as properties.
Removed unused test dependencies from pom.xml
Merge branch '2.1-dev' into 3.0-dev

Conflicts:
	pom.xml