TRUNK-3944: Responded to review comments
(cherry picked from commit 56c743b869668cef595160db7b6247c9d2c4bde8)
TRUNK-3944: Fixed the build (different dataset)
TRUNK-3944: Responded to more review comments
(cherry picked from commit bf40931d8fad0ef622106e267048787181270588)

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