ws fix
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_language_scanner_defs.h