FL-381: FL-747: unfork dev-lang/php, this will include upstream php-5.5.4