model adjustments due to upgrade to openmrs 1.7