Merge "Fix starting jenkins jobs for test UpgradeFromPikeToQueens"