Merge "[CVP] Fixed cleaning up cvp containers" into release/proposed/2019.2.0