Fix for OVPMS-1470 NPE importing product data

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@5939 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1320 The standard distribution is missing document templates for some types

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