ISTWCMS-6363: merge banner work

Merged Eric Bremner requested to merge feature/ISTWCMS-6363-ebremner-merge-banner-work into 1.1.x

ISTWCMS-6351: moving the banner text overlay options to a function so that we dont require a big update hook in the future

Merge request reports