Properly recognize PHP_5.6 from git wrt bug 66021

(cherry picked from commit 8b1ce65a2bb8c8b12fa0c0e79357259849aac003)
Merge branch '4.0' into 4.1