TRUNK-3944: Responded to more review comments
(cherry picked from commit bf40931d8fad0ef622106e267048787181270588)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java