make the gateway parameters to make the gateways samples the same

It was noticed that the sample gateways were diferent. Brian West
suggest that I merge all the parameters into both examples.
fs-6859

conf/vanilla/sip_profiles/external-ipv6/example.xml

@@ -28,11 +28,14 @@
   <!--<param name="caller-id-in-from" value="false"/>-->
   <!--extra sip params to send in the contact-->
   <!--<param name="contact-params" value=""/>-->
+  <!-- Put the extension in the contact -->
+  <!--<param name="extension-in-contact" value="true"/>-->
   <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
   <!--<param name="ping" value="25"/>-->
-  <!--</gateway>-->
+  <!--<param name="cid-type" value="rpid"/>-->
   <!--rfc5626 : Abilitazione rfc5626 ///-->
   <!--<param name="rfc-5626" value="true"/>-->
   <!--rfc5626 : extra sip params to send in the contact-->
   <!--<param name="reg-id" value="1"/>-->
+  <!--</gateway>-->
 </include>

conf/vanilla/sip_profiles/external/example.xml

@@ -28,11 +28,14 @@
   <!--<param name="caller-id-in-from" value="false"/>-->
   <!--extra sip params to send in the contact-->
   <!--<param name="contact-params" value=""/>-->
+  <!-- Put the extension in the contact -->
+  <!--<param name="extension-in-contact" value="true"/>-->
   <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
   <!--<param name="ping" value="25"/>-->
-  <!--</gateway>-->
+  <!--<param name="cid-type" value="rpid"/>-->
   <!--rfc5626 : Abilitazione rfc5626 ///-->
   <!--<param name="rfc-5626" value="true"/>-->
   <!--rfc5626 : extra sip params to send in the contact-->
   <!--<param name="reg-id" value="1"/>-->
+  <!--</gateway>-->
 </include>