fix jinja includes and remiove contrail from mk22-lab-dvr
diff --git a/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml b/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml
index 584ee04..c6152a8 100644
--- a/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml
+++ b/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml
@@ -1,5 +1,5 @@
-{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME %}
-{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 %}
+{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME with context %}
+{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install support services