Manually set location tags (for login and admission)
Merge branch 'master' of https://github.com/openmrs/openmrs-module-emrapi