Adding more app.xml files.
Upgrading app.xml versions.
Cleaned-up features.xml.

Change-Id: I7c5a85480568ffe35281286aefc9aa4e1b3b2afd
diff --git a/features/features.xml b/features/features.xml
index 0a9728d..6f8da0c 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -155,7 +155,7 @@
         <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- ONOS built-in apps -->
+    <!-- ONOS built-in app features -->
 
     <feature name="onos-app-fwd" version="@FEATURE-VERSION"
              description="ONOS sample forwarding application">
@@ -225,7 +225,23 @@
         <bundle>mvn:org.onosproject/onos-app-metrics-topology/@ONOS-VERSION</bundle>
     </feature>
 
-    <!-- Sample apps: to be moved to a different repo -->
+
+    <!-- ONOS test app features -->
+
+    <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
+             description="ONOS intent perf applications">
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
+    </feature>
+
+    <feature name="onos-app-election" version="@FEATURE-VERSION"
+             description="ONOS app leadership election test">
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
+    </feature>
+
+
+    <!-- ONOS sample app features: to be moved to a different repo -->
 
     <feature name="onos-app-tvue" version="@FEATURE-VERSION"
              description="ONOS sample topology viewer application">
@@ -248,24 +264,12 @@
         <bundle>mvn:org.onosproject/onos-app-demo/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-intent-perf" version="@FEATURE-VERSION"
-             description="ONOS intent perf applications">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-intent-perf/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-database-perf" version="@FEATURE-VERSION"
              description="ONOS partitioned database perf application">
         <feature>onos-api</feature>
         <bundle>mvn:org.onosproject/onos-app-database-perf/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-election" version="@FEATURE-VERSION"
-             description="ONOS app leadership election test">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-calendar" version="@FEATURE-VERSION"
              description="REST interface for scheduling intents from an external calendar">
         <feature>onos-api</feature>