Duration term for minutes and months conflict - TRUNK-4491

Follow up to rename constants for snomed codes and hl7 code - TRUNK-4491

Follow up - TRUNK-4491

Conflicts:
	api/src/main/resources/liquibase-update-to-latest.xml
	api/src/test/resources/org/openmrs/include/standardTestDataset.xml