dev-php/hhvm: sync some fixes from javer overlay, workaround pcre collision