Deal with PHP bug 63411 and tweaked sleep waits

Change-Id: Idf7a949a181aca52662ecce84e9e9256b8151aa8
Merge "Deal with PHP bug 63411 and tweaked sleep waits"