Fixes merge issue
Merge with 4.11.7
fix merge issue
Merge with 4.11.7
change build version number
Close 6.1.0-public branch, merged.
Merge with 4.11.7
Merge with 4.11.7
fixes typo on word disallow
fixed typo
fixed typo
Close 4.11.7 - cmsContentXml fixes branch
Merge with 4.11.8
Fixes merge issue, changed to version 4.11.8, removes post build copy (thought that was removed a long time ago)
Closing branch 6.0.5 as that version number was used for the emergency security fixes
Closing branch 4.11.9 as that version number was used for the emergency security fixes
Fixes issues with transfering logic over to LegacyDialogHandler
Merge with 4.11.9
Changed to 4.11.9
Added tag release-4.11.9 for changeset fb8fd83e8e70