Fix dos style eol in phpts
Merge branch 'PHP-5.5' into PHP-5.6
Fix one more test in dos style eol
Merge branch 'PHP-5.6'