fix bug #64660 - yyparse can return 2, not only 1
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #64660 - yyparse can return 2, not only 1

Conflicts:
	Zend/zend_language_scanner.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64660 - yyparse can return 2, not only 1