pepare for release

git-svn-id: svn://svn.openvpms.org/openvpms/framework/trunk@6017 9e4fa352-aafb-0310-9071-df624684024b
Merge remote-tracking branch 'remotes/trunk' into 1.7.1-CDIT-beta

Conflicts:
	pom.xml