Merge "remove -all- job from basic cluster tests"