From cf4a5d170233d938ca5836283e1a755cd7f6624a Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Fri, 12 Jun 2015 09:36:34 -0500
Subject: [PATCH] FS-7648 clean 2

---
 conf/testing/dialplan/default/0000_local_extensions.xml | 2 +-
 conf/testing/sip_profiles/external-ipv6.xml             | 8 +-------
 conf/testing/sip_profiles/external.xml                  | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/conf/testing/dialplan/default/0000_local_extensions.xml b/conf/testing/dialplan/default/0000_local_extensions.xml
index 3ffeab8544..0870d53d2f 100644
--- a/conf/testing/dialplan/default/0000_local_extensions.xml
+++ b/conf/testing/dialplan/default/0000_local_extensions.xml
@@ -5,7 +5,7 @@
     <action application="bridge" data="user/$1@${domain_name}"/>
     <action application="answer"/>
     <action application="sleep" data="1000"/>
-    <action application="bridge" data="loopback/app=voicemail:default $1 ${dialed_extension}"/>
+    <action application="bridge" data="loopback/app=voicemail:default ${domain_name} $1"/>
   </condition>
 </extension>
   
diff --git a/conf/testing/sip_profiles/external-ipv6.xml b/conf/testing/sip_profiles/external-ipv6.xml
index 7dc5906c5f..be6e65efe4 100644
--- a/conf/testing/sip_profiles/external-ipv6.xml
+++ b/conf/testing/sip_profiles/external-ipv6.xml
@@ -1,15 +1,9 @@
 <profile name="external-ipv6">
-  <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
-  <!-- This profile is only for outbound registrations to providers -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="external-ipv6/*.xml"/>
+    <NO-PRE-PROCESS cmd="include" data="external-ipv6/*.xml"/>
   </gateways>
 
   <aliases>
-    <!--
-        <alias name="outbound"/>
-        <alias name="nat"/>
-    -->
   </aliases>
 
   <domains>
diff --git a/conf/testing/sip_profiles/external.xml b/conf/testing/sip_profiles/external.xml
index 6edc878c06..faaffad2e7 100644
--- a/conf/testing/sip_profiles/external.xml
+++ b/conf/testing/sip_profiles/external.xml
@@ -2,7 +2,7 @@
   <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
   <!-- This profile is only for outbound registrations to providers -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="external/*.xml"/>
+    <NOPRE-PROCESS cmd="include" data="external/*.xml"/>
   </gateways>
 
   <aliases>