GCI-09 from user hexafraction

I'm completing GCI-09 with this pull request. `openmrs-api` tests pass (25 skipped by JUnit).