4.4 merge

@davecivicrm  So, after this merge it no longer tries to merge the xml changes in - I did get a merge conflict & reset the xml file & now it accepts that change as 'unwelcome'