Merge "[dovetail] Run mandatory and optional test cases with 2 jobs"