CRM-13186 - Disable Household contact type and formatting corrections