Added time units to HIV discontiuation date to avoid problems with discontinuing on the same day as enrolling
Updated roles and privileges metadata package to get new Data Clerk, Manager and System Administrator roles