Merge branch '1.8-dev'

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