Changes for OVPMS-1511 Stock export and import

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@6170 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1511 Stock export and import

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@6171 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1511 Stock export and import

git-svn-id: svn://svn.openvpms.org/openvpms/archetypes/trunk@6176 9e4fa352-aafb-0310-9071-df624684024b
Merge branch 'remote-trunk'

Conflicts:
	src/java/org/openvpms/archetype/rules/product/io/ProductCSVReader.java
	src/test/java/org/openvpms/archetype/rules/product/io/ProductCSVWriterReaderTestCase.java