AETHER-3110 Make keyingtries configurable

Change-Id: Ib18b7590b461126dd7e6bcde3c87336163dc913b
diff --git a/templates/ipsec.conf.j2 b/templates/ipsec.conf.j2
index 6a1ad85..67f4e6c 100644
--- a/templates/ipsec.conf.j2
+++ b/templates/ipsec.conf.j2
@@ -13,7 +13,7 @@
     keylife={{ strongswan_conf_phase2_lifetime }}
     lifetime={{ strongswan_conf_phase2_lifetime }}
     rekeymargin=3m
-    keyingtries=3
+    keyingtries={{ strongswan_conf_keyingtries }}
     keyexchange={{ strongswan_conf_key_exchange }}
     mobike=no
     ike={{ strongswan_conf_ike_cipher }}
@@ -36,5 +36,7 @@
     right={{ conn.right }}
     rightsubnet={{ conn.right_subnets }}
     rightauth={{ strongswan_conf_auth_type }}
+{% if conn.vti is defined %}
     mark=%unique
+{% endif %}
 {% endfor %}