diff --git a/pom.xml b/pom.xml
index fcdb1f4..b8dddf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,18 +195,6 @@
         </exclusion>
     TODO but shiro.web.env.EnvironmentLoader currently requires org.osgi.service.http.NamespaceException,
     which is available in osgi.compendium, thus commented; so sort out duplicate classpath entries with exclusion of felix.configadmin instead, and remove this
- -->
-        <!-- TODO AAA Shiro leads to various duplicate classpath entries which really should be cleaned up, and is not needed at least for now
-           but neutron has dependencies on aaa.shiro in neutron.northbound-api web.xml, so we actually do need it...
-           TODO sort out those duplicate classpath entries for good, and then completely remove this exclusion.
-        <exclusion>
-          <groupId>org.opendaylight.aaa</groupId>
-          <artifactId>odl-aaa-shiro</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.opendaylight.aaa</groupId>
-          <artifactId>aaa-shiro-act</artifactId>
-        </exclusion>
  -->
         <exclusion>
           <groupId>org.opendaylight.netconf</groupId>
@@ -226,6 +214,18 @@
           <groupId>org.opendaylight.odlparent</groupId>
           <artifactId>odl-karaf-feat-jdbc</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.opendaylight.aaa</groupId>
+          <artifactId>odl-aaa-shiro</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.opendaylight.aaa</groupId>
+          <artifactId>aaa-shiro-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.opendaylight.aaa</groupId>
+          <artifactId>aaa-shiro-act</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -234,6 +234,11 @@
       <artifactId>web-jetty-impl</artifactId>
       <version>0.9.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa.web</groupId>
+      <artifactId>servlet-jersey2</artifactId>
+      <version>0.9.0-SNAPSHOT</version>
+    </dependency>
 
     <!-- TODO Align dropwizard.metrics in odlparent, controller and infrautils and ditch this -->
     <dependency>