Merge "[CVP] Fix cleanup execution for cvp jobs" into release/proposed/2019.2.0