Fix for OVPMS-1482 NPE editing product-supplier relationship

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/trunk@5971 9e4fa352-aafb-0310-9071-df624684024b
Fix for OVPMS-1486 Appointment details on dark backgrounds with notes become illegible on selection

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