Feature/istwcms 4866 ebremner clean up

Closed Eric Bremner requested to merge feature/ISTWCMS-4866-ebremner-clean-up into 3.0.x

Merge request reports