Fixed tests due to changes in output of the fix for issue #811.
Merged pull request #48
Added a test for bug 625 to verify `xdebug_get_headers()` does not reset headers
Fixed test case to count for default_charset setting and rename other test case.
Merged pull request #50
Merge branch 'xdebug_2_2'

Conflicts:
	tests/bug00627.phpt
fix PHP 5.5 build
Some cosmetic CS changes to keep it all the same.
Merged pull request #51
Merge branch 'xdebug_2_2'
Fixed PHP Bug #60330: Xebug 2.2.x requires autotools 2.60.
Merged pull request #52
Merge branch 'xdebug_2_2'