pepare for release

git-svn-id: svn://svn.openvpms.org/openvpms/openvpms/trunk@6016 9e4fa352-aafb-0310-9071-df624684024b
merged back changes from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/openvpms/branches/1.8-dev@6054 9e4fa352-aafb-0310-9071-df624684024b