Merge "Skip orchestration scenario tests if heat service not available"