Fix for OVPMS-1459 Letter parameters initial focus

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/trunk@5891 9e4fa352-aafb-0310-9071-df624684024b
Fix for  OVPMS-1448 NPE viewing customer appointment in a different location to the current one

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

Conflicts:
	openvpms-web-component/src/main/java/org/openvpms/web/resource/localisation/messages.properties