Consolidation of watermark message code
Merge branch 'release/1.3-moorfields' of github.com:openeyes/OpenEyes into release/1.3-moorfields