Merge "[CVP,Q4] Remove 2 default parameters from cvp-tempest" into release/proposed/2019.2.0