CONN-1359 Fixed issue with domain edit and issues with trust bundles including file upload
Merge pull request #909 from jsmith2/CONN-1121