ISTWCMS-5016: updating to match updated features

Merged Eric Bremner requested to merge feature/ISTWCMS-5016-ebremner-update-features into 1.0.x

Merge request reports