More cleanup  related to online update checking
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  More cleanup  related to online update checking

Conflicts:
	amp_conf/htdocs/admin/page.modules.php