JIRA COMPATIBLEONE-74 correction of PHP 5.4 issues in all sources