Merge "Move around/add PHP_SAPI check, making find-entries happier."