Fix issues with OpenMRS 1.10
Fix xml files to reflect new schema
Make erp client always create an encounter whenever a new feed arrives. Earlier, we were trying to put this into the older encounter.
Fix tests.
Add back providermanagement omod.