Merge "Fix Sonobuoy test execution completion waiting"