Merge "Revert "Add parameter TEMPEST_VERSION for cvp_func job PROD-21521 Change-Id: I700209e5a48d648a1f781001482781bfc2ecb4ce""