OCLM-13 Fix the module to run on OpenMRS 2.1 and KenyaEMR