Integrated changes for OVPMS-1172 "Remove contact.faxNumber and replace with contact.phoneNumber, update existing fax numbers to the new system" contributed by Ben Charlton

git-svn-id: svn://svn.openvpms.org/openvpms/maven/branches/1.8-dev@6349 9e4fa352-aafb-0310-9071-df624684024b
Merge branch 'remote-1.8'