Change Security Shield Message
Version Bump
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Version Bump
  Change Security Shield Message

Conflicts:
	amp_conf/htdocs/admin/page.modules.php
Merge branch 'release/12.0' into develop

* release/12.0:
  Version Bump
  Change Security Shield Message