Merge "Fix CERTIFICATE_* tags vts test failures"