Merge "Update vts test to use the updated test template." into oc-mr1-dev