Merge "Bug 4628: Add detection to deploy test script"