Merge branch 'master' into 'MasterBugFixing'
Merge branch 'master' into 'DataManagement'
Merge branch 'MasterBugFixing' into 'master'
Merge branch 'master' into 'MasterBugFixing'
Merge branch 'MasterBugFixing' into 'master'
BS-8648: replace &, < and > with &, <, > respectivley in node contents when parsing and rebuilding xml files
Merge branch '6.3.x' into 'DataManagement'
Merge branch 'DataManagement' into 'BS-2683_DM_Compo'