ONOS-1993 Implement API-level permission checking + security util code location replacement

Change-Id: I7bf20eda9c12ed2a44334504333b093057764cd2
diff --git a/features/features.xml b/features/features.xml
index 2a45f98..ba7e641 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -132,9 +132,9 @@
 
     <feature name="onos-security" version="@FEATURE-VERSION"
              description="Security-Mode ONOS">
-        <!--<bundle>mvn:org.onosproject/onos-security-felix/2.2.0-ONOS</bundle>-->
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/org.apache.felix.framework.security/2.2.0.onos-SNAPSHOT</bundle>
         <bundle>mvn:org.onosproject/onos-security-impl/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-security-util/@ONOS-VERSION</bundle>
     </feature>
 
     <!-- Deprecated! For standalone testing only. -->