Updated with feedback from Tim Gething

git-svn-id: svn://svn.openvpms.org/openvpms/release/branches/1.8-dev@6183 9e4fa352-aafb-0310-9071-df624684024b
Merge branch 'remote-1.8'
Merge branch 'master' of https://github.com/CharltonIT/openvpms-release