CRM-14096 make d6 config file exactly the same as d7