Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0

c523e01 [CVP] Fixed cleaning up stopped cvp containers

Change-Id: I1d4b2a4547bbf4668a9e7bcb808768524f0ab0e0