Merge "Change some default values for cvp jobs. Attempt 2"