Merge "Change some default values for cvp-ha job"