Merge "Remove extra quotes on cvp-spt job parameter" into release/proposed/2019.2.0