Allow empty-element Diameter Applications and use that format.

This also fixes a couple of applications that weren't properly terminated
(as a result of some of my recent changes).

Change-Id: I9662017a81c63aceeb950d3b29cb17dde16d4f0c
Reviewed-on: https://code.wireshark.org/review/8335
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 114 insertions, 114 deletions

diff --git a/diameter/Ericsson.xml b/diameter/Ericsson.xml
index 780b185c14..8ccb0023f7 100644
--- a/diameter/Ericsson.xml
+++ b/diameter/Ericsson.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<application id="16777228"	name="Ericsson Zx"			uri="none"></application>
-<application id="16777232"	name="Ericsson Charging-CIP"		uri="none"></application>
-<application id="16777233"	name="Ericsson Mm"			uri="none"></application>
-<application id="16777269"	name="Ericsson HSI"			uri="none"></application>
-<application id="16777301"	name="Ericsson Charging-DCIP"		uri="none"></application>
-<application id="16777304"	name="Ericsson Sy"			uri="none"></application>
-<application id="16777315"	name="Ericsson Diameter Signalling Controller Application (DSC)" uri="none"></application>
-<application id="16777227"	name="Ericsson MSI"			uri="none"></application>
-<application id="16777327"	name="Ericsson Sx"			uri="none"></application>
+<application id="16777228"	name="Ericsson Zx"			uri="none"/>
+<application id="16777232"	name="Ericsson Charging-CIP"		uri="none"/>
+<application id="16777233"	name="Ericsson Mm"			uri="none"/>
+<application id="16777269"	name="Ericsson HSI"			uri="none"/>
+<application id="16777301"	name="Ericsson Charging-DCIP"		uri="none"/>
+<application id="16777304"	name="Ericsson Sy"			uri="none"/>
+<application id="16777315"	name="Ericsson Diameter Signalling Controller Application (DSC)" uri="none"/>
+<application id="16777227"	name="Ericsson MSI"			uri="none"/>
+<application id="16777327"	name="Ericsson Sx"			uri="none"/>
 
 <vendor vendor-id="Ericsson"			code="193"	name="Ericsson">
 <!-- *********** Last updated 2007-04-12 ************ -->
diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
index e294e85c0c..0359c6387b 100644
--- a/diameter/Nokia.xml
+++ b/diameter/Nokia.xml
@@ -2,8 +2,8 @@
 
 <!-- Nokia vendor-specific AVPs. Simple encoding, by old (oleksandr.darchuk[AT]gmail.com). 02.03.2009 -->
 
-<application id="16777328"	name="Nokia Service Extension, NSE"	uri="none"></application>
-<application id="16777341"	name="Nokia Sdr"			uri="none"></application>
+<application id="16777328"	name="Nokia Service Extension, NSE"	uri="none"/>
+<application id="16777341"	name="Nokia Sdr"			uri="none"/>
 
 <vendor vendor-id="Nokia"			code="94"	name="Nokia">
 
diff --git a/diameter/NokiaSolutionsAndNetworks.xml b/diameter/NokiaSolutionsAndNetworks.xml
index 1e686b5fe0..6129daf205 100644
--- a/diameter/NokiaSolutionsAndNetworks.xml
+++ b/diameter/NokiaSolutionsAndNetworks.xml
@@ -11,7 +11,7 @@
 	</avp>
 </application>
 
-<application id="16777246"	name="NSN Unified Charging Trigger Function (UCTF)" uri="none"></application>
+<application id="16777246"	name="NSN Unified Charging Trigger Function (UCTF)" uri="none"/>
 
 <vendor vendor-id="NokiaSolutionsAndNetworks"	code="28458"	name="Nokia Solutions and Networks">
     <avp name="Account-State" code="60528" mandatory-flag="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSolutionsAndNetworks">
diff --git a/diameter/TGPP2.xml b/diameter/TGPP2.xml
index 2afa17ba40..bc1fdea32f 100644
--- a/diameter/TGPP2.xml
+++ b/diameter/TGPP2.xml
@@ -2,7 +2,7 @@
 
 <vendor vendor-id="TGPP2"			code="5535"	name="3GPP2"/>
 
-<application id="16777323"	name="3GPP2 M1"	uri="http://www.3gpp2.org/Public_html/specs/X.S0068-0_v1.0_M2M_Enhancements_20140718.pdf"></application>
+<application id="16777323"	name="3GPP2 M1"	uri="http://www.3gpp2.org/Public_html/specs/X.S0068-0_v1.0_M2M_Enhancements_20140718.pdf"/>
 
 <application id="16777237"	name="3GPP2 Ty"	uri="http://www.3gpp2.org/public_html/specs/x.s0013-014-0_v1.0_080224.pdf">
 	<!--- TGPP2 AVPs X.S0013-013-0 (Tx):
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 3fc98626c3..83beb840d6 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -6442,85 +6442,85 @@
 	<!-- ********************************************************************** -->
 	<!-- ************************* Application IDs **************************** -->
 	<!-- ********************************************************************** -->
-	<application id="0"		name="Diameter Common Messages"		uri="http://tools.ietf.org/html/rfc6733"></application>
+	<application id="0"		name="Diameter Common Messages"		uri="http://tools.ietf.org/html/rfc6733"/>
 	<!-- application 1		is defined in nasreq.xml -->
 	<!-- application 2		is defined in mobileipv4.xml -->
-	<application id="3"		name="Diameter Base Accounting"		uri="http://tools.ietf.org/html/rfc6733"></application>
+	<application id="3"		name="Diameter Base Accounting"		uri="http://tools.ietf.org/html/rfc6733"/>
 	<!-- application 4		is defined in chargecontrol.xml -->
 	<!-- application 5		is defined in eap.xml -->
 	<!-- application 6		is defined in sip.xml -->
 	<!-- application 7		is defined in mobileipv6.xml -->
 	<!-- application 8		is defined in mobileipv6.xml -->
-	<application id="9"		name="Diameter QoS application"		uri="http://tools.ietf.org/html/rfc5866"></application>
-	<application id="10"		name="Diameter Capabilities Update"	uri="http://tools.ietf.org/html/rfc6737"></application>
-	<application id="11"		name="Diameter IKE SK (IKESK)"		uri="http://tools.ietf.org/html/rfc6738"></application>
-	<application id="12"		name="Diameter NAT Control Application"	uri="http://tools.ietf.org/html/rfc6736"></application>
-	<application id="13"		name="Diameter ERP"			uri="http://tools.ietf.org/html/rfc6942"></application>
+	<application id="9"		name="Diameter QoS application"		uri="http://tools.ietf.org/html/rfc5866"/>
+	<application id="10"		name="Diameter Capabilities Update"	uri="http://tools.ietf.org/html/rfc6737"/>
+	<application id="11"		name="Diameter IKE SK (IKESK)"		uri="http://tools.ietf.org/html/rfc6738"/>
+	<application id="12"		name="Diameter NAT Control Application"	uri="http://tools.ietf.org/html/rfc6736"/>
+	<application id="13"		name="Diameter ERP"			uri="http://tools.ietf.org/html/rfc6942"/>
 
 	<!-- application 16777216	is defined in TGPP.xml -->
 	<!-- application 16777217	is defined in TGPP.xml -->
-	<application id="16777218"	name="3GPP Re/Rf"			uri="http://www.3GPP.org/ftp/Specs/html-info/32296.htm"></application>
-	<application id="16777219"	name="3GPP Wx"				uri="http://www.3GPP.org/ftp/Specs/html-info/29234.htm"></application>
-	<application id="16777220"	name="3GPP Zn"				uri="http://www.3GPP.org/ftp/Specs/html-info/29109.htm"></application>
-	<application id="16777221"	name="3GPP Zh"				uri="http://www.3GPP.org/ftp/Specs/html-info/29109.htm"></application>
+	<application id="16777218"	name="3GPP Re/Rf"			uri="http://www.3GPP.org/ftp/Specs/html-info/32296.htm"/>
+	<application id="16777219"	name="3GPP Wx"				uri="http://www.3GPP.org/ftp/Specs/html-info/29234.htm"/>
+	<application id="16777220"	name="3GPP Zn"				uri="http://www.3GPP.org/ftp/Specs/html-info/29109.htm"/>
+	<application id="16777221"	name="3GPP Zh"				uri="http://www.3GPP.org/ftp/Specs/html-info/29109.htm"/>
 	<!-- application 16777222	is defined in TGPP.xml -->
 	<!-- application 16777223	is defined in TGPP.xml -->
-	<application id="16777224"	name="3GPP Gx"				uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm">
-	<application id="16777225"	name="3GPP Gx over Gy"			uri="http://www.3GPP.org/ftp/Specs/html-info/29210.htm"></application>
-	<application id="16777226"	name="3GPP MM10"			uri="http://www.3GPP.org/ftp/Specs/html-info/29140.htm"></application>
+	<application id="16777224"	name="3GPP Gx"				uri="http://www.3gpp.org/ftp/Specs/html-info/29210.htm"/>
+	<application id="16777225"	name="3GPP Gx over Gy"			uri="http://www.3GPP.org/ftp/Specs/html-info/29210.htm"/>
+	<application id="16777226"	name="3GPP MM10"			uri="http://www.3GPP.org/ftp/Specs/html-info/29140.htm"/>
 	<!-- application 16777227	is defined in Ericsson.xml -->
 	<!-- application 16777228	is defined in Ericsson.xml -->
-	<application id="16777229"	name="3GPP Rx Release 6"		uri="http://www.3GPP.org/ftp/Specs/html-info/29211.htm"></application>
-	<application id="16777230"	name="3GPP Pr"				uri="http://www.3gpp.org/ftp/Specs/html-info/29234.htm"></application>
+	<application id="16777229"	name="3GPP Rx Release 6"		uri="http://www.3GPP.org/ftp/Specs/html-info/29211.htm"/>
+	<application id="16777230"	name="3GPP Pr"				uri="http://www.3gpp.org/ftp/Specs/html-info/29234.htm"/>
 	<!-- application 16777231	is defined in etsie2e4.xml -->
 	<!-- application 16777232	is defined in Ericsson.xml -->
 	<!-- application 16777233	is defined in Ericsson.xml -->
 	<!-- application 16777234	is defined in Vodafone.xml -->
-	<application id="16777235"	name="ITU-T Rs"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11971"></application>
+	<application id="16777235"	name="ITU-T Rs"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11971"/>
 	<!-- application 16777236	is defined in TGPP.xml -->
 	<!-- application 16777237	is defined in TGPP2.xml -->
-	<application id="16777238"	name="3GPP Gx"				uri="http://www.3GPP.org/ftp/Specs/html-info/29210.htm"></application>
-	<application id="16777239"	name="Juniper Cluster"			uri="none"></application>
-	<application id="16777240"	name="Juniper Policy-Control-AAA"	uri="none"></application>
-	<application id="16777241"	name="iptego USPI"			uri="none"></application>
-	<application id="16777242"	name="Covergence-specific SIP routing"	uri="none"></application>
-	<application id="16777243"	name="Policy Processing"		uri="none"></application>
-	<application id="16777244"	name="Juniper Policy-Control-JSRC"	uri="none"></application>
-	<application id="16777245"	name="ITU-T S-TC1"			uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=9340"></application>
+	<application id="16777238"	name="3GPP Gx"				uri="http://www.3GPP.org/ftp/Specs/html-info/29210.htm"/>
+	<application id="16777239"	name="Juniper Cluster"			uri="none"/>
+	<application id="16777240"	name="Juniper Policy-Control-AAA"	uri="none"/>
+	<application id="16777241"	name="iptego USPI"			uri="none"/>
+	<application id="16777242"	name="Covergence-specific SIP routing"	uri="none"/>
+	<application id="16777243"	name="Policy Processing"		uri="none"/>
+	<application id="16777244"	name="Juniper Policy-Control-JSRC"	uri="none"/>
+	<application id="16777245"	name="ITU-T S-TC1"			uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=9340"/>
 	<!-- application 16777246	is defined in NokiaSolutionsAndNetworks.xml -->
-	<application id="16777247"	name="3GPP2 CAN Access Authentication and Authorization"	uri="http://www.3gpp2.org/Public_html/specs/X.S0054-100-0_v2.0_080909.pdf"></application>
-	<application id="16777248"	name="3GPP2 WLAN Interworking Access Authentication and Authorization"	uri="http://www.3gpp2.org/Public_html/specs/X.S0028-200-A_v1.0_080625.pdf"></application>
-	<application id="16777249"	name="3GPP2 WLAN Interworking Accounting"	uri="http://www.3gpp2.org/Public_html/specs/X.S0028-200-A_v1.0_080625.pdf"></application>
-	<application id="16777250"	name="3GPP STa"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
-	<application id="16777251"	name="3GPP S6a/S6d"			uri="http://tools.ietf.org/html/rfc5516"></application>
-	<application id="16777252"	name="3GPP S13/S13'"			uri="http://tools.ietf.org/html/rfc5516"></application>
-	<application id="16777253"	name="ETSI Re"				uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183060%5C03.01.01_60%5Cts_183060v030101p.pdf"></application>
-	<application id="16777254"	name="ETSI GOCAP"			uri="http://www.etsi.org/deliver/etsi_es%5C283000_283099%5C28303902%5C03.01.01_60%5Ces_28303902v030101p.pdf"></application>
-	<application id="16777255"	name="3GPP SLg"				uri="http://www.3gpp.org/ftp/Specs/html-info/29172.htm"></application>
-	<application id="16777256"	name="ITU-T Rw"				uri="https://tools.ietf.org/html/rfc5431"></application>
-	<application id="16777257"	name="ETSI a4"				uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183066%5C02.01.01_60%5Cts_183066v020101p.pdf"></application>
-	<application id="16777258"	name="ITU-T Rt"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11450"></application>
-	<application id="16777259"	name="CARA"				uri="none"></application>
-	<application id="16777260"	name="CAMA"				uri="none"></application>
-	<application id="16777261"	name="Femtocell extension to Diameter EAP Application" uri="none"></application>
-	<application id="16777262"	name="ITU-T Ru"				uri="none"></application>
-	<application id="16777263"	name="ITU-T Ng"				uri="none"></application>
-	<application id="16777264"	name="3GPP SWm"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
-	<application id="16777265"	name="3GPP SWx"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
-	<application id="16777266"	name="3GPP Gxx"				uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"></application>
+	<application id="16777247"	name="3GPP2 CAN Access Authentication and Authorization"	uri="http://www.3gpp2.org/Public_html/specs/X.S0054-100-0_v2.0_080909.pdf"/>
+	<application id="16777248"	name="3GPP2 WLAN Interworking Access Authentication and Authorization"	uri="http://www.3gpp2.org/Public_html/specs/X.S0028-200-A_v1.0_080625.pdf"/>
+	<application id="16777249"	name="3GPP2 WLAN Interworking Accounting"	uri="http://www.3gpp2.org/Public_html/specs/X.S0028-200-A_v1.0_080625.pdf"/>
+	<application id="16777250"	name="3GPP STa"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"/>
+	<application id="16777251"	name="3GPP S6a/S6d"			uri="http://tools.ietf.org/html/rfc5516"/>
+	<application id="16777252"	name="3GPP S13/S13'"			uri="http://tools.ietf.org/html/rfc5516"/>
+	<application id="16777253"	name="ETSI Re"				uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183060%5C03.01.01_60%5Cts_183060v030101p.pdf"/>
+	<application id="16777254"	name="ETSI GOCAP"			uri="http://www.etsi.org/deliver/etsi_es%5C283000_283099%5C28303902%5C03.01.01_60%5Ces_28303902v030101p.pdf"/>
+	<application id="16777255"	name="3GPP SLg"				uri="http://www.3gpp.org/ftp/Specs/html-info/29172.htm"/>
+	<application id="16777256"	name="ITU-T Rw"				uri="https://tools.ietf.org/html/rfc5431"/>
+	<application id="16777257"	name="ETSI a4"				uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183066%5C02.01.01_60%5Cts_183066v020101p.pdf"/>
+	<application id="16777258"	name="ITU-T Rt"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11450"/>
+	<application id="16777259"	name="CARA"				uri="none"/>
+	<application id="16777260"	name="CAMA"				uri="none"/>
+	<application id="16777261"	name="Femtocell extension to Diameter EAP Application" uri="none"/>
+	<application id="16777262"	name="ITU-T Ru"				uri="none"/>
+	<application id="16777263"	name="ITU-T Ng"				uri="none"/>
+	<application id="16777264"	name="3GPP SWm"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"/>
+	<application id="16777265"	name="3GPP SWx"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"/>
+	<application id="16777266"	name="3GPP Gxx"				uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"/>
 	<!-- application 16777267	is defined in TGPP.xml -->
-	<application id="16777268"	name="3GPP Zpn"				uri="http://www.3gpp.org/ftp/Specs/html-info/29109.htm"></application>
+	<application id="16777268"	name="3GPP Zpn"				uri="http://www.3gpp.org/ftp/Specs/html-info/29109.htm"/>
 	<!-- application 16777269	is defined in Ericsson.xml -->
-	<application id="16777270"	name="Juniper-Example"			uri="none"></application>
-	<application id="16777271"	name="ITU-T Ri"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=9881"></application>
-	<application id="16777272"	name="3GPP S6b"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"></application>
-	<application id="16777273"	name="Juniper JGx"			uri="none"></application>
-	<application id="16777274"	name="ITU-T Rd"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=10224"></application>
-	<application id="16777275"	name="ADMI Notification Application"	uri="none"></application>
-	<application id="16777276"	name="ADMI Messaging Interface Application"	uri="none"></application>
-	<application id="16777277"	name="Peter-Service VSI"		uri="none"></application>
-	<application id="16777278"	name="ETSI Rr request model"		uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183071%5C03.01.01_60%5Cts_183071v030101p.pdf"></application>
-	<application id="16777279"	name="ETSI Rr delegated model"		uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183071%5C03.01.01_60%5Cts_183071v030101p.pdf"></application>
+	<application id="16777270"	name="Juniper-Example"			uri="none"/>
+	<application id="16777271"	name="ITU-T Ri"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=9881"/>
+	<application id="16777272"	name="3GPP S6b"				uri="http://www.3gpp.org/ftp/Specs/html-info/29273.htm"/>
+	<application id="16777273"	name="Juniper JGx"			uri="none"/>
+	<application id="16777274"	name="ITU-T Rd"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=10224"/>
+	<application id="16777275"	name="ADMI Notification Application"	uri="none"/>
+	<application id="16777276"	name="ADMI Messaging Interface Application"	uri="none"/>
+	<application id="16777277"	name="Peter-Service VSI"		uri="none"/>
+	<application id="16777278"	name="ETSI Rr request model"		uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183071%5C03.01.01_60%5Cts_183071v030101p.pdf"/>
+	<application id="16777279"	name="ETSI Rr delegated model"		uri="http://www.etsi.org/deliver/etsi_ts%5C183000_183099%5C183071%5C03.01.01_60%5Cts_183071v030101p.pdf"/>
 			<!--
 			 16777280 WIMAX HRPD Interworking [3GPP2 X.S0058-0 v1.0][Avi_Lior]
 			 16777281 WiMAX Network Access Authentication and Authorization Diameter Application (WNAAADA) [WiMAX Release 1.5][Avi_Lior]
@@ -6534,59 +6534,59 @@
 			 16777289 WiMAX-Policy-and-Charging-Control-R3-Offline-Charging-Prime Diameter Application (WiMAX PCC-R3-OFC-PRIME) [WiMAX Release 1.5][Avi_Lior]
 			 16777290 WiMAX-Policy-and-Charging-Control-R3-Online-Charging Diameter Application (WiMAX PCC-R3-OC) [WiMAX Release 1.5][Avi_Lior]
 			-->
-	<application id="16777291"	name="3GPP SLh"				uri="http://www.3gpp.org/ftp/Specs/html-info/29173.htm"></application>
+	<application id="16777291"	name="3GPP SLh"				uri="http://www.3gpp.org/ftp/Specs/html-info/29173.htm"/>
 	<!-- application 16777292	is defined in TGPP.xml -->
-	<application id="16777293"	name="Cloudmark Diameter Interface"	uri="none"></application>
-	<application id="16777294"	name="Camiant DRMA"			uri="none"></application>
-	<application id="16777295"	name="PiLTE Interworking Diameter Application" uri="http://www.3gpp2.org/Public_html/specs/X.S0057-0%20v3.0%20(clean)%20E-UTRAN-eHRPD%20Interworking.pdf"></application>
-	<application id="16777296"	name="Juniper-Sessions-Recovery"	uri="none"></application>
-	<application id="16777297"	name="Vedicis LiveProxy"		uri="none"></application>
-	<application id="16777298"	name="Pi*3GPP2 Diameter Application"	uri="http://www.3gpp2.org/Public_html/specs/X.S0057-A%20v2.0_20121018.pdf"></application>
-	<application id="16777299"	name="Sandvine Rf+"			uri="none"></application>
-	<application id="16777300"	name="Subscription Information Application" uri="none"></application>
+	<application id="16777293"	name="Cloudmark Diameter Interface"	uri="none"/>
+	<application id="16777294"	name="Camiant DRMA"			uri="none"/>
+	<application id="16777295"	name="PiLTE Interworking Diameter Application" uri="http://www.3gpp2.org/Public_html/specs/X.S0057-0%20v3.0%20(clean)%20E-UTRAN-eHRPD%20Interworking.pdf"/>
+	<application id="16777296"	name="Juniper-Sessions-Recovery"	uri="none"/>
+	<application id="16777297"	name="Vedicis LiveProxy"		uri="none"/>
+	<application id="16777298"	name="Pi*3GPP2 Diameter Application"	uri="http://www.3gpp2.org/Public_html/specs/X.S0057-A%20v2.0_20121018.pdf"/>
+	<application id="16777299"	name="Sandvine Rf+"			uri="none"/>
+	<application id="16777300"	name="Subscription Information Application" uri="none"/>
 	<!-- application 16777301	is defined in Ericsson.xml -->
-	<application id="16777302"	name="3GPP Sy"				uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"></application>
-	<application id="16777303"	name="3GPP Sd"				uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"></application>
+	<application id="16777302"	name="3GPP Sy"				uri="http://www.3gpp.org/ftp/Specs/html-info/29219.htm"/>
+	<application id="16777303"	name="3GPP Sd"				uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"/>
 	<!-- application 16777304	is defined in Ericsson.xml -->
-	<application id="16777305"	name="HP DTD"				uri="none"></application>
-	<application id="16777306"	name="ITU-T M9"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11570"></application>
-	<application id="16777307"	name="ITU-T M13"			uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11712"></application>
-	<application id="16777308"	name="3GPP S7a"				uri="http://www.3gpp.org/ftp/Specs/html-info/29272.htm"></application>
-	<application id="16777309"	name="3GPP Tsp"				uri="http://www.3gpp.org/ftp/Specs/html-info/29368.htm"></application>
-	<application id="16777310"	name="3GPP S6m"				uri="http://www.3gpp.org/ftp/Specs/html-info/29336.htm"></application>
-	<application id="16777311"	name="3GPP T4"				uri="http://www.3gpp.org/ftp/Specs/html-info/29337.htm"></application>
-	<application id="16777312"	name="3GPP S6c"				uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"></application>
-	<application id="16777313"	name="3GPP SGd"				uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"></application>
-	<application id="16777314"	name="Intrado-SLg"			uri="none"></application>
+	<application id="16777305"	name="HP DTD"				uri="none"/>
+	<application id="16777306"	name="ITU-T M9"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11570"/>
+	<application id="16777307"	name="ITU-T M13"			uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=11712"/>
+	<application id="16777308"	name="3GPP S7a"				uri="http://www.3gpp.org/ftp/Specs/html-info/29272.htm"/>
+	<application id="16777309"	name="3GPP Tsp"				uri="http://www.3gpp.org/ftp/Specs/html-info/29368.htm"/>
+	<application id="16777310"	name="3GPP S6m"				uri="http://www.3gpp.org/ftp/Specs/html-info/29336.htm"/>
+	<application id="16777311"	name="3GPP T4"				uri="http://www.3gpp.org/ftp/Specs/html-info/29337.htm"/>
+	<application id="16777312"	name="3GPP S6c"				uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"/>
+	<application id="16777313"	name="3GPP SGd"				uri="http://www.3gpp.org/ftp/Specs/html-info/29338.htm"/>
+	<application id="16777314"	name="Intrado-SLg"			uri="none"/>
 	<!-- application 16777315	is defined in Ericsson.xml -->
-	<application id="16777316"	name="Verizon-Femto-Loc"		uri="none"></application>
+	<application id="16777316"	name="Verizon-Femto-Loc"		uri="none"/>
 	<!-- application 16777317	is defined in NokiaSolutionsAndNetworks.xml -->
-	<application id="16777318"	name="3GPP S15"				uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"></application>
-	<application id="16777319"	name="3GPP S9a"				uri="http://www.3gpp.org/ftp/Specs/html-info/29215.htm"></application>
-	<application id="16777320"	name="3GPP S9a*"			uri="http://www.3gpp.org/ftp/Specs/html-info/29215.htm"></application>
-	<application id="16777321"	name="Gateway Location Application"	uri="none"></application>
-	<application id="16777322"	name="Verizon Session Recovery"		uri="none">
+	<application id="16777318"	name="3GPP S15"				uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm"/>
+	<application id="16777319"	name="3GPP S9a"				uri="http://www.3gpp.org/ftp/Specs/html-info/29215.htm"/>
+	<application id="16777320"	name="3GPP S9a*"			uri="http://www.3gpp.org/ftp/Specs/html-info/29215.htm"/>
+	<application id="16777321"	name="Gateway Location Application"	uri="none"/>
+	<application id="16777322"	name="Verizon Session Recovery"		uri="none"/>
 	<!-- application 16777323	is defined in TGPP2.xml -->
-	<application id="16777324"	name="MAGIC Client Interface Protocol (CIP)" uri="none"></application>
-	<application id="16777325"	name="ITU-T Nc"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=12217"></application>
-	<application id="16777326"	name="ITU-T Ne"				uri="none"></application>
+	<application id="16777324"	name="MAGIC Client Interface Protocol (CIP)" uri="none"/>
+	<application id="16777325"	name="ITU-T Nc"				uri="http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=12217"/>
+	<application id="16777326"	name="ITU-T Ne"				uri="none"/>
 	<!-- application 16777327	is defined in Ericsson.xml -->
 	<!-- application 16777328	is defined in Nokia.xml -->
-	<application id="16777329"	name="Rivada Xd"			uri="none"></application>
-	<application id="16777330"	name="Rivada Xm"			uri="none"></application>
-	<application id="16777331"	name="Rivada Xh"			uri="none"></application>
-	<application id="16777332"	name="Rivada Xf"			uri="none"></application>
-	<application id="16777333"	name="Rivada Xf"			uri="none"></application>
-	<application id="16777334"	name="Rivada Xp"			uri="none"></application>
-	<application id="16777335"	name="3GPP MB2-C"			uri="http://www.3gpp.org/ftp/Specs/html-info/29468.htm"></application>
-	<application id="16777336"	name="3GPP PC4a"			uri="http://www.3gpp.org/ftp/Specs/html-info/29344.htm"></application>
-	<application id="16777337"	name="3GPP PC2"				uri="http://www.3gpp.org/ftp/Specs/html-info/29343.htm"></application>
-	<application id="16777338"	name="Juniper Domain Policy"		uri="none"></application>
-	<application id="16777339"	name="Host Observer"			uri="none"></application>
-	<application id="16777340"	name="3GPP PC6/PC7"			uri="http://www.3gpp.org/ftp/Specs/html-info/29345.htm"></application>
+	<application id="16777329"	name="Rivada Xd"			uri="none"/>
+	<application id="16777330"	name="Rivada Xm"			uri="none"/>
+	<application id="16777331"	name="Rivada Xh"			uri="none"/>
+	<application id="16777332"	name="Rivada Xf"			uri="none"/>
+	<application id="16777333"	name="Rivada Xf"			uri="none"/>
+	<application id="16777334"	name="Rivada Xp"			uri="none"/>
+	<application id="16777335"	name="3GPP MB2-C"			uri="http://www.3gpp.org/ftp/Specs/html-info/29468.htm"/>
+	<application id="16777336"	name="3GPP PC4a"			uri="http://www.3gpp.org/ftp/Specs/html-info/29344.htm"/>
+	<application id="16777337"	name="3GPP PC2"				uri="http://www.3gpp.org/ftp/Specs/html-info/29343.htm"/>
+	<application id="16777338"	name="Juniper Domain Policy"		uri="none"/>
+	<application id="16777339"	name="Host Observer"			uri="none"/>
+	<application id="16777340"	name="3GPP PC6/PC7"			uri="http://www.3gpp.org/ftp/Specs/html-info/29345.htm"/>
 	<!-- application 16777341	is defined in Nokia.xml -->
-	<application id="16777342"	name="3GPP Np"				uri="http://www.3gpp.org/ftp/Specs/html-info/29217.htm"></application>
-	<application id="4294967295"	name="Relay"				uri="http://tools.ietf.org/html/rfc6733"></application>
+	<application id="16777342"	name="3GPP Np"				uri="http://www.3gpp.org/ftp/Specs/html-info/29217.htm"/>
+	<application id="4294967295"	name="Relay"				uri="http://tools.ietf.org/html/rfc6733"/>
 	<!-- *********************** End Application IDs ************************** -->
 
 
diff --git a/diameter/mobileipv6.xml b/diameter/mobileipv6.xml
index 9556e1d3f4..000edc65ae 100644
--- a/diameter/mobileipv6.xml
+++ b/diameter/mobileipv6.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<application id="7" name="Diameter Mobile IPv6 IKE   (MIP6I)" uri="http://tools.ietf.org/html/rfc5778"></application>
+<application id="7" name="Diameter Mobile IPv6 IKE   (MIP6I)" uri="http://tools.ietf.org/html/rfc5778"/>
 <application id="8" name="Diameter Mobile IPv6 Auth  (MIP6A)" uri="http://tools.ietf.org/html/rfc5778">
 
 	<!-- Mobile-IPv6 Application -->