Minor clean-up of the 4.2.1 migration.

- eliminated annotations in a few remaining abstract component classes
- cleaned up gui/gui2 feature bundle lists
- added version to the karaf features patch
- loading onos-rest by default in karaf features patch
- onos-gui loading still WIP

Change-Id: Ie5a74c0daee939a9d2de30e1737e4f88dd2ae478
diff --git a/tools/package/etc/org.apache.karaf.features.cfg b/tools/package/etc/org.apache.karaf.features.cfg
index 9578400..88818f6 100644
--- a/tools/package/etc/org.apache.karaf.features.cfg
+++ b/tools/package/etc/org.apache.karaf.features.cfg
@@ -53,12 +53,12 @@
     webconsole/4.2.1, \
     scr/4.2.1, \
     war/4.2.1, \
-    onos-api, \
-    onos-core, \
-    onos-incubator, \
-    onos-cli,
-    #onos-gui,
-    #onos-rest
+    onos-api/1.15.0.SNAPSHOT, \
+    onos-core/1.15.0.SNAPSHOT, \
+    onos-incubator/1.15.0.SNAPSHOT, \
+    onos-cli/1.15.0.SNAPSHOT, \
+    onos-rest/1.15.0.SNAPSHOT
+    #onos-gui
 
 
 #