Feature/istwcms 6259 ebremner media edit fix

Merged Eric Bremner requested to merge feature/ISTWCMS-6259-ebremner-media-edit-fix into 1.1.x

Merge request reports