backport to 1.9.3
Merge branch 'master' of https://github.com/wesleysee/openmrs-module-programaccesscontrol