CRM-19986 Fix schema differences between a new installl and an upgrade from 4.6