Feature/istwcms 6165 ebremner fix views query wcms2

Merged Eric Bremner requested to merge feature/ISTWCMS-6165-ebremner-fix-views-query-wcms2 into 1.1.x

Merge request reports