Extensions to the HTML Form Entry module to support OpenMRS 1.9 changes