Fixed 'HIV Discontinuation' form using wrong encounter type
* Updated to new core metadata package
* Added liquibase changeset to fix existing data