AM-57 and other CR fixes
Merge branch 'master' of https://github.com/openmrs/openmrs-module-appointment