FREEPBX-7474 PHP 5.4 compatibility
Merge branch 'release/2.11' into develop

* release/2.11:
  FREEPBX-7474 PHP 5.4 compatibility

Conflicts:
	amp_conf/htdocs/admin/libraries/module.functions.php
Merge branch 'develop' into release/12.0

* develop:
  FREEPBX-7474 PHP 5.4 compatibility