Fix #68185 - Inconsistent insteadof definition
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #68185 - Inconsistent insteadof definition

Conflicts:
	Zend/zend_compile.c