Fixes for compatibility
Merge branch '4.3-php55cleanup' into 4.3

Conflicts:
	lib/ApiCLI.php
	lib/DB.php