From 4aad03972002ddb38d663648c64ff0ae7c3b2e2d Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 13 Jun 2017 14:54:53 +0200
Subject: [PATCH] Apply multiple edits to remove Karaf 3

This is a combination of 3 commits.
The first commit's message is:

Bug 8625: Karaf 4 restricted to offset 0

https://git.opendaylight.org/gerrit/#/c/58538/3

Bug 8625: Move Karaf 3 to non-default aggregator

This way autorelease can keep building Karaf 4 compatible projects only,
while Int/Dist merge job can be configured to build also Karaf 3.

This would need support from Releng/Builder to work that way.

https://git.opendaylight.org/gerrit/#/c/58539/3

This is the 4th commit message:

Remove Karaf 3 completely

https://git.opendaylight.org/gerrit/#/c/58541/3

Change-Id: I37f3f6d27b223068eda9c761ca781ec38aef263c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 artifacts/upstream/all/pom.xml                |   7 -
 artifacts/upstream/artifacts/pom.xml          |   2 +
 artifacts/upstream/feature-repos/pom.xml      |  10 +
 artifacts/upstream/feature3-repos/pom.xml     | 514 ------------------
 artifacts/upstream/pom.xml                    |   1 -
 artifacts/upstream/single-features/pom.xml    |   8 +
 distribution-karaf/pom.xml                    | 133 -----
 .../bin/configure-cluster-ipdetect.sh         | 265 ---------
 .../main/assembly/bin/configure_cluster.sh    | 223 --------
 .../main/assembly/bin/custom_shard_config.txt |  17 -
 .../src/main/assembly/bin/set_persistence.sh  | 111 ----
 .../assembly/etc/org.ops4j.pax.url.mvn.cfg    | 107 ----
 features/repos/index/pom.xml                  | 110 ++--
 .../pom.xml                                   |  10 +
 features3-distribution/pom.xml                |  75 ---
 .../src/main/features/features.xml            |  20 -
 features3-index/pom.xml                       | 432 ---------------
 .../src/main/features/features.xml            | 100 ----
 features3-test/pom.xml                        |  63 ---
 features3-test/src/main/features/features.xml | 168 ------
 pom.xml                                       |   4 -
 21 files changed, 95 insertions(+), 2285 deletions(-)
 delete mode 100644 artifacts/upstream/feature3-repos/pom.xml
 delete mode 100644 distribution-karaf/pom.xml
 delete mode 100755 distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh
 delete mode 100755 distribution-karaf/src/main/assembly/bin/configure_cluster.sh
 delete mode 100644 distribution-karaf/src/main/assembly/bin/custom_shard_config.txt
 delete mode 100755 distribution-karaf/src/main/assembly/bin/set_persistence.sh
 delete mode 100644 distribution-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
 delete mode 100644 features3-distribution/pom.xml
 delete mode 100644 features3-distribution/src/main/features/features.xml
 delete mode 100644 features3-index/pom.xml
 delete mode 100644 features3-index/src/main/features/features.xml
 delete mode 100644 features3-test/pom.xml
 delete mode 100644 features3-test/src/main/features/features.xml

diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 38c4f431..50f2632e 100644
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -51,13 +51,6 @@
                 <type>pom</type>
             </dependency>
             <!-- TODO: All of the following should contain directions on how to get rid of their content. -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>feature3-repo-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>feature-repo-artifacts</artifactId>
diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 4f3edfa8..e213b39f 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -41,6 +41,7 @@
         <dependencies>
             <!-- Project artifact poms. -->
             <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
                 <artifactId>bgpcep-artifacts</artifactId>
@@ -48,6 +49,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-artifacts</artifactId>
diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 55836f67..06e9e44e 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -82,6 +82,7 @@
             </dependency>
 
             <!-- Dlux -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.dlux</groupId>
                 <artifactId>features4-dlux</artifactId>
@@ -89,8 +90,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- Dlux Apps -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.dluxapps</groupId>
                 <artifactId>features4-dluxapps</artifactId>
@@ -98,6 +101,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- InfraUtils -->
             <dependency>
@@ -148,6 +152,7 @@
             </dependency>
 
             <!-- OpenFlow Plugin -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.openflowplugin</groupId>
                 <artifactId>features4-openflowplugin</artifactId>
@@ -176,8 +181,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- SNMP -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.snmp</groupId>
                 <artifactId>features4-snmp</artifactId>
@@ -185,8 +192,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- SXP -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.sxp</groupId>
                 <artifactId>features4-sxp</artifactId>
@@ -194,6 +203,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
         </dependencies>
     </dependencyManagement>
diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
deleted file mode 100644
index 5bbd34e1..00000000
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.integration</groupId>
-        <artifactId>properties</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-        <relativePath>../properties</relativePath>
-    </parent>
-    <artifactId>feature3-repo-artifacts</artifactId>
-    <packaging>pom</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>POM to import, with all user-facing upstream ODL Karaf 3 feature repository artifact versions.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/feature3-repos;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <!-- Question: This basically duplicates features-index dependencies just to save 1 line per dependency there. Worth it? -->
-    <!-- Answer: This will be deleted soon, and even if not, projects should provide these in artifact poms. -->
-    <dependencyManagement>
-        <dependencies>
-            <!-- For feature repositories (Karaf 3), by project. -->
-            <!-- Aaa -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features-aaa</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Alto -->
-            <dependency>
-                <groupId>org.opendaylight.alto</groupId>
-                <artifactId>features-alto-release</artifactId>
-                <version>${alto.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Bgpcep -->
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features-bgp</artifactId>
-                <classifier>features</classifier>
-                <version>${bgpcep.version}</version>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features-bmp</artifactId>
-                <classifier>features</classifier>
-                <version>${bgpcep.version}</version>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features-extras</artifactId>
-                <classifier>features</classifier>
-                <version>${bgpcep.version}</version>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features-pcep</artifactId>
-                <classifier>features</classifier>
-                <version>${bgpcep.version}</version>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features-rsvp</artifactId>
-                <classifier>features</classifier>
-                <version>${bgpcep.version}</version>
-                <type>xml</type>
-            </dependency>
-            <!-- Bier -->
-            <dependency>
-                <groupId>org.opendaylight.bier</groupId>
-                <artifactId>features-bier</artifactId>
-                <classifier>features</classifier>
-                <version>${bier.version}</version>
-                <type>xml</type>
-            </dependency>
-            <!-- Cardinal -->
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>cardinal-features</artifactId>
-                <version>${cardinal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Controller -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features-extras</artifactId>
-                <version>${controller.extras.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features-mdsal-benchmark</artifactId>
-                <version>${benchmark.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Didm -->
-            <dependency>
-                <groupId>org.opendaylight.didm</groupId>
-                <artifactId>features-didm</artifactId>
-                <version>${didm.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.didm</groupId>
-                <artifactId>features-didm-hp</artifactId>
-                <version>${didm.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.didm</groupId>
-                <artifactId>features-didm-ovs</artifactId>
-                <version>${didm.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Dlux -->
-            <dependency>
-                <groupId>org.opendaylight.dlux</groupId>
-                <artifactId>features-dlux</artifactId>
-                <version>${dlux.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Dluxapps -->
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>features-dluxapps</artifactId>
-                <version>${dluxapps.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Eman -->
-            <dependency>
-                <groupId>org.opendaylight.eman</groupId>
-                <artifactId>eman-features</artifactId>
-                <version>${eman.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Faas -->
-            <dependency>
-                <groupId>org.opendaylight.faas</groupId>
-                <artifactId>features-faas</artifactId>
-                <version>${faas.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Federation -->
-            <dependency>
-                <groupId>org.opendaylight.federation</groupId>
-                <artifactId>federation-features</artifactId>
-                <version>${federation.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Genius -->
-            <dependency>
-                <groupId>org.opendaylight.genius</groupId>
-                <artifactId>genius-features</artifactId>
-                <version>${genius.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Groupbasedpolicy -->
-            <dependency>
-                <groupId>org.opendaylight.groupbasedpolicy</groupId>
-                <artifactId>features-groupbasedpolicy</artifactId>
-                <version>${groupbasedpolicy.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Honeycomb/Vbd -->
-            <dependency>
-                <groupId>org.opendaylight.honeycomb.vbd</groupId>
-                <artifactId>vbd-features</artifactId>
-                <version>${honeycomb.vbd.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Infrautils -->
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>infrautils-features</artifactId>
-                <version>${infrautils.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Iotdm -->
-            <dependency>
-                <groupId>org.opendaylight.iotdm</groupId>
-                <artifactId>iotdmcsitdist-features</artifactId>
-                <version>${iotdm.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- L2switch -->
-            <dependency>
-                <groupId>org.opendaylight.l2switch</groupId>
-                <artifactId>features-l2switch</artifactId>
-                <version>${l2switch.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Lacp -->
-            <dependency>
-                <groupId>org.opendaylight.lacp</groupId>
-                <artifactId>features-lacp</artifactId>
-                <version>${lacp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Lispflowmapping -->
-            <dependency>
-                <groupId>org.opendaylight.lispflowmapping</groupId>
-                <artifactId>features-lispflowmapping</artifactId>
-                <version>${lispflowmapping.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Nemo -->
-            <dependency>
-                <groupId>org.opendaylight.nemo</groupId>
-                <artifactId>nemo-features</artifactId>
-                <version>${nemo.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features-netconf</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features-netconf-connector</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features-restconf</artifactId>
-                <version>${restconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Netvirt -->
-            <dependency>
-                <groupId>org.opendaylight.netvirt</groupId>
-                <artifactId>vpnservice-features</artifactId>
-                <version>${vpnservice.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Netide -->
-            <dependency>
-                <groupId>org.opendaylight.netide</groupId>
-                <artifactId>netide-features</artifactId>
-                <version>${netide.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Neutron -->
-            <dependency>
-                <groupId>org.opendaylight.neutron</groupId>
-                <artifactId>features-neutron</artifactId>
-                <version>${neutron.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Nic -->
-            <dependency>
-                <groupId>org.opendaylight.nic</groupId>
-                <artifactId>features-nic</artifactId>
-                <version>${nic.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Ocpplugin -->
-            <dependency>
-                <groupId>org.opendaylight.ocpplugin</groupId>
-                <artifactId>features-ocpplugin</artifactId>
-                <version>${ocpplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Odlparent -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features-akka</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features-odlparent</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Of-config -->
-            <dependency>
-                <groupId>org.opendaylight.of-config</groupId>
-                <artifactId>features-of-config</artifactId>
-                <version>${of-config.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Openflowplugin -->
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features-openflowplugin</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features-openflowplugin-he</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features-openflowplugin-extension</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features-openflowplugin-extension-he</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Ovsdb -->
-            <dependency>
-                <groupId>org.opendaylight.ovsdb</groupId>
-                <artifactId>library-features</artifactId>
-                <version>${ovsdb.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.ovsdb</groupId>
-                <artifactId>southbound-features</artifactId>
-                <version>${ovsdb.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.ovsdb</groupId>
-                <artifactId>hwvtepsouthbound-features</artifactId>
-                <version>${ovsdb.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Packetcable -->
-            <dependency>
-                <groupId>org.opendaylight.packetcable</groupId>
-                <artifactId>features-packetcable-policy</artifactId>
-                <version>${packetcable.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Sdninterfaceapp -->
-            <dependency>
-                <groupId>org.opendaylight.sdninterfaceapp</groupId>
-                <artifactId>features-sdninterfaceapp</artifactId>
-                <version>${sdninterfaceapp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Sfc -->
-            <dependency>
-                <groupId>org.opendaylight.sfc</groupId>
-                <artifactId>features-sfc</artifactId>
-                <version>${sfc.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Snmp -->
-            <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>features-snmp</artifactId>
-                <version>${snmp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Snmp4sdn -->
-            <!-- Commented out because https://bugs.opendaylight.org/show_bug.cgi?id=8409
-            <dependency>
-                <groupId>org.opendaylight.snmp4sdn</groupId>
-                <artifactId>features-snmp4sdn</artifactId>
-                <version>${snmp4sdn.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-            <!-- Sxp -->
-            <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>features</artifactId>
-                <version>${sxp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Topoprocessing -->
-            <dependency>
-                <groupId>org.opendaylight.topoprocessing</groupId>
-                <artifactId>features-topoprocessing</artifactId>
-                <version>${topoprocessing.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Tsdr -->
-            <dependency>
-                <groupId>org.opendaylight.tsdr</groupId>
-                <artifactId>features-tsdr</artifactId>
-                <version>${tsdr.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Ttp -->
-            <dependency>
-                <groupId>org.opendaylight.ttp</groupId>
-                <artifactId>features-ttp</artifactId>
-                <version>${ttp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Unimgr -->
-            <!-- Removing on 5/23/17 b/c of compilation failures
-            <dependency>
-                <groupId>org.opendaylight.unimgr</groupId>
-                <artifactId>unimgr-features</artifactId>
-                <version>${unimgr.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-            <!-- Usc -->
-            <dependency>
-                <groupId>org.opendaylight.usc</groupId>
-                <artifactId>usc-features</artifactId>
-                <version>${usc.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <!-- Vtn -->
-            <dependency>
-                <groupId>org.opendaylight.vtn</groupId>
-                <artifactId>features-vtn-manager</artifactId>
-                <version>${vtn-manager.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index b08c8888..75abff83 100644
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -43,7 +43,6 @@
     <modules>
         <module>properties</module>
         <module>artifacts</module>
-        <module>feature3-repos</module>
         <module>feature-repos</module>
         <module>single-features</module>
         <module>other</module>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index c59958f0..df083d54 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -71,6 +71,7 @@
             </dependency>
 
             <!-- Dlux -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.dlux</groupId>
                 <artifactId>odl-dlux-core</artifactId>
@@ -78,6 +79,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- Netconf -->
             <dependency>
@@ -96,6 +98,7 @@
             </dependency>
 
             <!-- OpenFlow Plugin -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.openflowplugin</groupId>
                 <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
@@ -103,8 +106,10 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            -->
 
             <!-- SNMP -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.snmp</groupId>
                 <artifactId>odl-snmp-plugin</artifactId>
@@ -112,8 +117,10 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            -->
 
             <!-- SXP -->
+            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.sxp</groupId>
                 <artifactId>odl-sxp-controller</artifactId>
@@ -121,6 +128,7 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            -->
 
         </dependencies>
     </dependencyManagement>
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
deleted file mode 100644
index f74a8461..00000000
--- a/distribution-karaf/pom.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>karaf-parent</artifactId>
-        <version>1.9.0</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>distribution-karaf</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>The Karaf 3 archives building sub-project.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=distribution-karaf;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <!-- opendaylight-karaf-parent uses this too -->
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>framework</artifactId>
-            <type>kar</type>
-        </dependency>
-        <!-- Integration index feature repository. -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>features-integration-index</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.odlparent</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Integration test feature repository. -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>features-integration-test</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.odlparent</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- External applications. -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>aaa-cli-jar</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-aaa-cli-jar</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
-                            <includeArtifactIds>aaa-cli-jar</includeArtifactIds>
-                            <overWriteReleases>true</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                            <excludeTransitive>true</excludeTransitive>
-                            <!-- Do not include version in JAR filename, as external scripts call this utility,
-                                 and they understandly do not want to have to adjust for every ODL release;
-                                 see e.g. https://github.com/dfarrell07/puppet-opendaylight/pull/140 -->
-                            <stripVersion>true</stripVersion>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh b/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh
deleted file mode 100755
index 7b97ef96..00000000
--- a/distribution-karaf/src/main/assembly/bin/configure-cluster-ipdetect.sh
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2015 Brocade Communications Systems, Inc. and others.  All rights reserved.
-# Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-#
-
-
-function usage()
-{
-    # Print any error messages
-    test "$1" != "" && echo " ERROR: $1"
-
-    # Print standard usage help
-    cat << EOF
- This script is used to configure cluster parameters on this
- controller. The user should restart controller to apply changes.
-
- Usage: $0 <seed_nodes_list>
-  - seed_nodes_list: List of seed nodes, separated by comma or space.
-
- The script checks that one (any) of the the controller's active IP
- addresses is present in the seed_nodes_list. When running this script
- on multiple  seed nodes, keep the seed_node_list same on all nodes.
-
- Optionally, shards can be configured in a more granular way by
- modifying the file "custom_shard_configs.txt" in the same folder
- as this tool.  Please see that file for more details.
-
-This script is currently limited to IPv4 addresses. If you have
-problems running this script, please use 'configure_cluster.sh'.
-
-EOF
-
-    exit 1
-}
-
-
-function start_banner
-{
-cat <<EOF
-################################################
-##             Configure Cluster              ##
-################################################
-EOF
-}
-
-function end_banner
-{
-cat <<EOF
-################################################
-##   NOTE: Manually restart controller to     ##
-##         apply configuration.               ##
-################################################
-EOF
-}
-
-# Utility function for joining strings.
-function join {
-    delim=',\n\t\t\t\t'
-    final=$1; shift
-
-    for str in $* ; do
-        final=${final}${delim}${str}
-    done
-
-    echo ${final}
-}
-
-function create_strings
-{
-    # Using a list of controller IPs, create the strings for data
-    # and rpc seed nodes, as well as the list of members.
-
-    # First create an arrays with one string per controller.
-    # Then merge the array using the join utility defined above.
-    count=1
-    for ip in ${CONTROLLERIPS[@]} ; do
-        ds[$count]=\\\"akka.tcp:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
-        rpc[$count]=\\\"akka.tcp:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
-        members[$count]=\\\"member-${count}\\\"
-        count=$[count + 1]
-    done
-
-    DATA_SEED_LIST=$(join ${ds[@]})
-    RPC_SEED_LIST=$(join ${rpc[@]})
-    MEMBER_NAME_LIST=$(join ${members[@]})
-}
-
-function module_shards_builder
-{
-
-    module_shards_string="module-shards = [\n\t{\n\t\tname = \"default\"\n\t\tshards = [\n\t\t\t{\n\t\t\t\tname = \"default\"\n\t\t\t\treplicas = []\n\t\t\t}\n\t\t]\n\t}"
-    for name in ${FRIENDLY_MODULE_NAMES[@]} ; do
-        module_shards_string="${module_shards_string},\n\t{\n\t\tname = \"${name}\"\n\t\tshards = [\n\t\t\t{\n\t\t\t\tname=\"${name}\"\n\t\t\t\treplicas = []\n\t\t\t}\n\t\t]\n\t}"
-    done
-
-    echo -e ${module_shards_string}"\n]"
-}
-
-function modules_builder
-{
-
-    modules_string="modules = [\n\t"
-    count=1
-    for name in ${FRIENDLY_MODULE_NAMES[@]} ; do
-        modules_string="${modules_string}\n\t{\n\t\tname = \"${name}\"\n\t\tnamespace = \"${MODULE_NAMESPACES[${count}]}\"\n\t\tshard-strategy = \"module\"\n\t},"
-        count=$[count + 1]
-    done
-
-    # using ::-1 below to remove the extra comma we get from the above loop
-    echo -e ${modules_string::-1}"\n]"
-}
-
-
-function get_index ()
-{
-    # Determine if the local IP address is in the CONTROLLER_LIST
-    # and its index in the list. Return the index.
-
-    local MY_IP=$1
-    shift
-    local IP_ADDRS=("$@")
-    local COUNTER=1
-
-    for IP in ${IP_ADDRS[@]} ;
-    do
-        if [ "$MY_IP" == "$IP" ]; then
-            echo "$COUNTER"
-            return
-        fi
-        COUNTER=$[$COUNTER + 1]
-    done
-    echo "$COUNTER"
-}
-
-function get_local_ip_addresses
-{
-    # Get the local node's IP addresses as list
-    LOCAL_IPS=()
-    for IP in `hostname -I`
-    do
-        LOCAL_IPS+=("$IP")
-    done
-    echo ${LOCAL_IPS[@]}
-}
-
-function get_cli_params
-{
-    # Check if params have been supplied
-    CONTROLLER_LIST=$*
-
-    # Verify we have controller list
-    test "${CONTROLLER_LIST}" == "" && usage "Missing controller list"
-
-    # Create the list of controllers from the CONTROLLER_LIST variable
-    CONTROLLERIPS=( ${CONTROLLER_LIST//,/ } )
-
-    # Get the local node's IP addresses
-    LOCAL_IPS=$(get_local_ip_addresses)
-
-    for CONTROLLER_IP in ${LOCAL_IPS[@]} ;
-    do
-        INDEX=$(get_index $CONTROLLER_IP ${CONTROLLERIPS[@]})
-        if [ ${INDEX} -le ${#CONTROLLERIPS[@]} ] ; then
-            break
-        fi
-    done
-
-    test ${INDEX} -le 0 -o ${INDEX} -gt ${#CONTROLLERIPS[@]} && \
-        usage "Controller's local IP address not in the controller list"
-
-    CONTROLLER_ID="member-${INDEX}"
-}
-
-
-function modify_conf_files
-{
-    BIN_DIR=`dirname $0`
-    CUSTOM_SHARD_CONFIG_FILE=${BIN_DIR}'/custom_shard_config.txt'
-    echo "Configuring unique name in akka.conf"
-    sed -i -e "/roles[ ]*=/ { :loop1 /.*\]/ b done1; N; b loop1; :done1 s/roles.*\]/roles = [\"${CONTROLLER_ID}\"]/}" ${AKKACONF}
-
-    echo "Configuring hostname in akka.conf"
-    sed -i -e "s/hostname[ ]*=.*\"/hostname = \"${CONTROLLER_IP}\"/" ${AKKACONF}
-
-    echo "Configuring data and rpc seed nodes in akka.conf"
-    sed -i -e "/seed-nodes[ ]*=/ { :loop2 /.*\]/ b done2; N; b loop2; :done2 s/seed-nodes.*opendaylight-cluster-data.*\]/seed-nodes = [${DATA_SEED_LIST}]/; s/seed-nodes.*odl-cluster-rpc.*\]/seed-nodes = [${RPC_SEED_LIST}]/}" ${AKKACONF}
-
-    if [ -f ${CUSTOM_SHARD_CONFIG_FILE} ]; then
-        source ${CUSTOM_SHARD_CONFIG_FILE}
-        if [ "${#FRIENDLY_MODULE_NAMES[@]}" -ne "${#MODULE_NAMESPACES[@]}" ]; then
-            echo -e "\ncustom shard config file \"${CUSTOM_SHARD_CONFIG_FILE}\" does not have the same number of FRIENDLY_MODULE_NAMES[] and MODULE_NAMESPACES[]\n"
-            exit 1
-        fi
-        module_shards_builder > ${MODULESHARDSCONF}
-        modules_builder > ${MODULESCONF}
-        cat ${MODULESCONF}
-    fi
-
-    echo "Configuring replication type in module-shards.conf"
-    sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF}
-}
-
-
-function verify_configuration_files
-{
-    # Constants
-    BIN_DIR=`dirname $0`
-    test ${BIN_DIR} == '.' && BIN_DIR=${PWD}
-    CONTROLLER_DIR=`dirname ${BIN_DIR}`
-    CONF_DIR=${CONTROLLER_DIR}/configuration/initial
-    AKKACONF=${CONF_DIR}/akka.conf
-    MODULESCONF=${CONF_DIR}/modules.conf
-    MODULESHARDSCONF=${CONF_DIR}/module-shards.conf
-
-    # Verify configuration files are present in expected location.
-    if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then
-        # Check if the configuration files exist in the system
-        # directory, then copy them over.
-        ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config
-        version=$(sed -n -e 's/.*<version>\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml)
-        ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version}
-        ORIG_AKKA_CONF=sal-clustering-config-${version}-akkaconf.xml
-        ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml
-        ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml
-
-        if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \
-             -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \
-             -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then
-            cat <<EOF
- NOTE: Cluster configuration files not found. Copying from
- ${ORIG_CONF_DIR}
-EOF
-            mkdir -p ${CONF_DIR}
-            cp ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} ${AKKACONF}
-            cp ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} ${MODULESCONF}
-            cp ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ${MODULESHARDSCONF}
-
-        else
-            cat << EOF
- ERROR: Cluster configurations files not found. Please\
- configure clustering feature.
-EOF
-            exit 1
-        fi
-    fi
-}
-
-function main
-{
-    get_cli_params $*
-    start_banner
-    verify_configuration_files
-    create_strings
-    modify_conf_files
-    end_banner
-}
-
-main $*
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
diff --git a/distribution-karaf/src/main/assembly/bin/configure_cluster.sh b/distribution-karaf/src/main/assembly/bin/configure_cluster.sh
deleted file mode 100755
index 5607767e..00000000
--- a/distribution-karaf/src/main/assembly/bin/configure_cluster.sh
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2015 Brocade Communications Systems, Inc. and others.  All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-#
-
-
-function usage()
-{
-    # Print any error messages
-    test "$1" != "" && echo " ERROR: $1"
-
-    # Print standard usage help
-    cat << EOF
- This script is used to configure cluster parameters on this
- controller. The user should restart controller to apply changes.
-
- Usage: $0 <index> <seed_nodes_list>
-  - index: Integer within 1..N, where N is the number of seed nodes.
-  - seed_nodes_list: List of seed nodes, separated by comma or space.
-
- The address at the provided index should belong this controller.
- When running this script on multiple seed nodes, keep the
- seed_node_list same, and vary the index from 1 through N.
-
- Optionally, shards can be configured in a more granular way by
- modifying the file "custom_shard_configs.txt" in the same folder
- as this tool.  Please see that file for more details
-
-EOF
-
-    exit 1
-}
-
-
-function start_banner
-{
-cat <<EOF
-################################################
-##             Configure Cluster              ##
-################################################
-EOF
-}
-
-function end_banner
-{
-cat <<EOF
-################################################
-##   NOTE: Manually restart controller to     ##
-##         apply configuration.               ##
-################################################
-EOF
-}
-
-# Utility function for joining strings.
-function join {
-    delim=',\n\t\t\t\t'
-    final=$1; shift
-
-    for str in $* ; do
-        final=${final}${delim}${str}
-    done
-
-    echo ${final}
-}
-
-function create_strings
-{
-    # Using a list of controller IPs, create the strings for data
-    # and rpc seed nodes, as well as the list of members.
-
-    # First create an arrays with one string per controller.
-    # Then merge the array using the join utility defined above.
-    count=1
-    for ip in ${CONTROLLERIPS[@]} ; do
-        ds[$count]=\\\"akka.tcp:\\/\\/opendaylight-cluster-data@${ip}:2550\\\"
-        rpc[$count]=\\\"akka.tcp:\\/\\/odl-cluster-rpc@${ip}:2551\\\"
-        members[$count]=\\\"member-${count}\\\"
-        count=$[count + 1]
-    done
-
-    DATA_SEED_LIST=$(join ${ds[@]})
-    RPC_SEED_LIST=$(join ${rpc[@]})
-    MEMBER_NAME_LIST=$(join ${members[@]})
-}
-
-function module_shards_builder
-{
-
-    module_shards_string="module-shards = [\n\t{\n\t\tname = \"default\"\n\t\tshards = [\n\t\t\t{\n\t\t\t\tname = \"default\"\n\t\t\t\treplicas = []\n\t\t\t}\n\t\t]\n\t}"
-    for name in ${FRIENDLY_MODULE_NAMES[@]} ; do
-        module_shards_string="${module_shards_string},\n\t{\n\t\tname = \"${name}\"\n\t\tshards = [\n\t\t\t{\n\t\t\t\tname=\"${name}\"\n\t\t\t\treplicas = []\n\t\t\t}\n\t\t]\n\t}"
-    done
-
-    echo -e ${module_shards_string}"\n]"
-}
-
-function modules_builder
-{
-
-    modules_string="modules = [\n\t"
-    count=1
-    for name in ${FRIENDLY_MODULE_NAMES[@]} ; do
-        modules_string="${modules_string}\n\t{\n\t\tname = \"${name}\"\n\t\tnamespace = \"${MODULE_NAMESPACES[${count}]}\"\n\t\tshard-strategy = \"module\"\n\t},"
-        count=$[count + 1]
-    done
-
-    # using ::-1 below to remove the extra comma we get from the above loop
-    echo -e ${modules_string::-1}"\n]"
-}
-
-function get_cli_params
-{
-    # Check if params have been supplied
-    test $# -eq 0 && usage
-
-    # First param is index, and rest are controller list
-    INDEX=$1; shift
-    CONTROLLER_LIST=$*
-
-    # Verify we have controller list
-    test "${CONTROLLER_LIST}" == "" && usage "Missing controller list"
-
-    # Create the list of controllers from the CONTROLLER_LIST variable
-    CONTROLLERIPS=( ${CONTROLLER_LIST//,/ } )
-
-    test ${INDEX} -le 0 -o ${INDEX} -gt ${#CONTROLLERIPS[@]} && \
-        usage "Invalid index"
-
-    CONTROLLER_ID="member-${INDEX}"
-    CONTROLLER_IP="${CONTROLLERIPS[((${INDEX} - 1))]}"
-}
-
-
-function modify_conf_files
-{
-    BIN_DIR=`dirname $0`
-    CUSTOM_SHARD_CONFIG_FILE=${BIN_DIR}'/custom_shard_config.txt'
-    echo "Configuring unique name in akka.conf"
-    sed -i -e "/roles[ ]*=/ { :loop1 /.*\]/ b done1; N; b loop1; :done1 s/roles.*\]/roles = [\"${CONTROLLER_ID}\"]/}" ${AKKACONF}
-
-    echo "Configuring hostname in akka.conf"
-    sed -i -e "s/hostname[ ]*=.*\"/hostname = \"${CONTROLLER_IP}\"/" ${AKKACONF}
-
-    echo "Configuring data and rpc seed nodes in akka.conf"
-    sed -i -e "/seed-nodes[ ]*=/ { :loop2 /.*\]/ b done2; N; b loop2; :done2 s/seed-nodes.*opendaylight-cluster-data.*\]/seed-nodes = [${DATA_SEED_LIST}]/; s/seed-nodes.*odl-cluster-rpc.*\]/seed-nodes = [${RPC_SEED_LIST}]/}" ${AKKACONF}
-
-    if [ -f ${CUSTOM_SHARD_CONFIG_FILE} ]; then
-        source ${CUSTOM_SHARD_CONFIG_FILE}
-        if [ "${#FRIENDLY_MODULE_NAMES[@]}" -ne "${#MODULE_NAMESPACES[@]}" ]; then
-            echo -e "\ncustom shard config file \"${CUSTOM_SHARD_CONFIG_FILE}\" does not have the same number of FRIENDLY_MODULE_NAMES[] and MODULE_NAMESPACES[]\n"
-            exit 1
-        fi
-        module_shards_builder > ${MODULESHARDSCONF}
-        modules_builder > ${MODULESCONF}
-        cat ${MODULESCONF}
-    fi
-
-    echo "Configuring replication type in module-shards.conf"
-    sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF}
-}
-
-
-function verify_configuration_files
-{
-    # Constants
-    BIN_DIR=`dirname $0`
-    test ${BIN_DIR} == '.' && BIN_DIR=${PWD}
-    CONTROLLER_DIR=`dirname ${BIN_DIR}`
-    CONF_DIR=${CONTROLLER_DIR}/configuration/initial
-    AKKACONF=${CONF_DIR}/akka.conf
-    MODULESCONF=${CONF_DIR}/modules.conf
-    MODULESHARDSCONF=${CONF_DIR}/module-shards.conf
-
-    # Verify configuration files are present in expected location.
-    if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then
-        # Check if the configuration files exist in the system
-        # directory, then copy them over.
-        ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config
-        version=$(sed -n -e 's/.*<version>\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml)
-        ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version}
-        ORIG_AKKA_CONF=sal-clustering-config-${version}-akkaconf.xml
-        ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml
-        ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml
-
-        if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \
-             -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \
-             -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then
-            cat <<EOF
- NOTE: Cluster configuration files not found. Copying from
- ${ORIG_CONF_DIR}
-EOF
-            mkdir -p ${CONF_DIR}
-            cp ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} ${AKKACONF}
-            cp ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} ${MODULESCONF}
-            cp ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ${MODULESHARDSCONF}
-
-        else
-            cat << EOF
- ERROR: Cluster configurations files not found. Please\
- configure clustering feature.
-EOF
-            exit 1
-        fi
-    fi
-}
-
-function main
-{
-    get_cli_params $*
-    start_banner
-    verify_configuration_files
-    create_strings
-    modify_conf_files
-    end_banner
-}
-
-main $*
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
diff --git a/distribution-karaf/src/main/assembly/bin/custom_shard_config.txt b/distribution-karaf/src/main/assembly/bin/custom_shard_config.txt
deleted file mode 100644
index e5363498..00000000
--- a/distribution-karaf/src/main/assembly/bin/custom_shard_config.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# If this file has entries, they will be used to configure the module
-# shards that will be available.  Otherwise, the default shards will
-# be used.  Below, the commented lines are the current default shards
-# (inventory, network-topology, and toaster)
-#
-# These configurations are an array and the indexes need to increment
-# from 1,2,3...
-#
-# There is a FRIENDLY_MODULE_NAME[$index] that will map to the
-# MODULE_NAMESPACES[$index]
-#
-FRIENDLY_MODULE_NAMES[1]='inventory'
-MODULE_NAMESPACES[1]='urn:opendaylight:inventory'
-FRIENDLY_MODULE_NAMES[2]='topology'
-MODULE_NAMESPACES[2]='urn:TBD:params:xml:ns:yang:network-topology'
-FRIENDLY_MODULE_NAMES[3]='toaster'
-MODULE_NAMESPACES[3]='http://netconfcentral.org/ns/toaster'
diff --git a/distribution-karaf/src/main/assembly/bin/set_persistence.sh b/distribution-karaf/src/main/assembly/bin/set_persistence.sh
deleted file mode 100755
index 15c22717..00000000
--- a/distribution-karaf/src/main/assembly/bin/set_persistence.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2015 Brocade Communications Systems, Inc. and others.  All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-#
-
-
-function usage()
-{
-    # Print any error messages
-    test "$1" != "" && echo " ERROR: $1"
-
-    # Print standard usage help
-    cat << EOF
- This script is used to enable or disable the config datastore
- persistence. The default state is enabled. The user should
- restart controller to apply changes. The script can be used
- before starting controller for the first time.
-
- Usage: $0 <on/off>
-
-EOF
-
-    exit 1
-}
-
-
-function end_banner
-{
-cat <<EOF
-################################################
-##   NOTE: Manually restart controller to     ##
-##         apply configuration.               ##
-################################################
-EOF
-}
-
-
-function get_cli_params
-{
-    # Check if params have been supplied
-    test $# -eq 0 && usage
-
-    # First param is on/off
-    SWITCH="$1"
-
-    # Verify we only have 1 param
-    test $# -ne 1 && usage "Too many parameters"
-}
-
-
-function modify_conf_file
-{
-    if [ "${SWITCH}" == "off"  ]; then
-        echo "disabling config datastore persistence"
-        sed -i -e "s/^#persistent=true/persistent=false/" ${CLUSTERCONF}
-    elif [ "${SWITCH}" == "on"  ]; then
-        echo "enabling config datastore persistence"
-        sed -i -e "s/^persistent=false/#persistent=true/" ${CLUSTERCONF}
-    else
-        usage "Allowed values are on/off"
-    fi
-}
-
-
-function verify_configuration_file
-{
-    # Constants
-    BIN_DIR=`dirname $0`
-    test ${BIN_DIR} == '.' && BIN_DIR=${PWD}
-    CONTROLLER_DIR=`dirname ${BIN_DIR}`
-    CONF_DIR=${CONTROLLER_DIR}/etc
-    CLUSTERCONF=${CONF_DIR}/org.opendaylight.controller.cluster.datastore.cfg
-
-    # Verify configuration files are present in expected location.
-    if [ ! -f ${CLUSTERCONF} ]; then
-        # Check if the configuration files exist in the system
-        # directory, then copy them over.
-        ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config
-        version=$(sed -n -e 's/.*<version>\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml)
-        ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version}
-        ORIG_CLUSTER_CONF=sal-clustering-config-${version}-datastore.cfg
-
-        if [ -f ${ORIG_CONF_DIR}/${ORIG_CLUSTER_CONF} ]; then
-            cat <<EOF
- NOTE: Cluster configuration file not found. Copying from
- ${ORIG_CONF_DIR}
-EOF
-            cp ${ORIG_CONF_DIR}/${ORIG_CLUSTER_CONF} ${CLUSTERCONF}
-
-        else
-            usage "Cluster configuration file not found"
-        fi
-    fi
-}
-
-function main
-{
-    get_cli_params "$@"
-    verify_configuration_file
-    modify_conf_file
-    end_banner
-}
-
-main "$@"
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
-
diff --git a/distribution-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/distribution-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
deleted file mode 100644
index 630c0f95..00000000
--- a/distribution-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg
+++ /dev/null
@@ -1,107 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# If set to true, the following property will not allow any certificate to be used
-# when accessing Maven repositories through SSL
-#
-#org.ops4j.pax.url.mvn.certificateCheck=
-
-#
-# Path to the local Maven settings file.
-# The repositories defined in this file will be automatically added to the list
-# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
-# below is not set.
-# The following locations are checked for the existence of the settings.xml file
-#   * 1. looks for the specified url
-#   * 2. if not found looks for ${user.home}/.m2/settings.xml
-#   * 3. if not found looks for ${maven.home}/conf/settings.xml
-#   * 4. if not found looks for ${M2_HOME}/conf/settings.xml
-#
-#org.ops4j.pax.url.mvn.settings=
-
-#
-# Path to the local Maven repository which is used to avoid downloading
-# artifacts when they already exist locally.
-# The value of this property will be extracted from the settings.xml file
-# above, or defaulted to:
-#     System.getProperty( "user.home" ) + "/.m2/repository"
-#
-org.ops4j.pax.url.mvn.localRepository=${karaf.home}/${karaf.default.repository}
-
-#
-# Default this to false. It's just weird to use undocumented repos
-#
-org.ops4j.pax.url.mvn.useFallbackRepositories=false
-
-#
-# Uncomment if you don't wanna use the proxy settings
-# from the Maven conf/settings.xml file
-#
-# org.ops4j.pax.url.mvn.proxySupport=false
-
-#
-# Disable aether support by default.  This ensure that the defaultRepositories
-# below will be used
-#
-#org.ops4j.pax.url.mvn.disableAether=true
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# Those repositories will be checked before iterating through the
-#    below list of repositories and even before the local repository
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#
-# The following property value will add the system folder as a repo.
-#
-#org.ops4j.pax.url.mvn.defaultRepositories=
-
-# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
-org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# The default list includes the following repositories containing releases:
-#    http://repo1.maven.org/maven2
-#    http://repository.apache.org/content/groups/snapshots-group
-#    http://svn.apache.org/repos/asf/servicemix/m2-repo
-#    http://repository.springsource.com/maven/bundles/release
-#    http://repository.springsource.com/maven/bundles/external
-# To add repositories to the default ones, prepend '+' to the list of repositories
-# to add.
-# A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
-#    @noreleases : the repository does not contain any released artifacts
-#    @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
-#
-# The default list doesn't contain any repository containing snapshots as it can impact the artifacts resolution.
-# You may want to add the following repositories containing snapshots:
-#    http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
-#    http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease
-#    http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
-#
-org.ops4j.pax.url.mvn.repositories= \
-	file:${karaf.home}/${karaf.default.repository}@id=system.repository, \
-    file:${karaf.data}/kar@id=kar.repository@multi, \
-    http://repo1.maven.org/maven2@id=central, \
-    http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \
-    http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \
-		http://zodiac.springsource.com/maven/bundles/release@id=gemini
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index e85099b6..6f10a3c0 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -61,6 +61,8 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Offset 0 -->
+
         <!-- AAA -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
@@ -75,119 +77,132 @@
             <type>xml</type>
         </dependency>
 
-        <!-- BGPCEP -->
+        <!-- Controller -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgp</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features4-extras</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bmp</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features4-mdsal</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgpcep-extras</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features4-mdsal-benchmark</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- InfraUtils -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-pcep</artifactId>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>infrautils-features4</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- FIXME: Add Mdsal -->
+
+        <!-- Netconf -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-rsvp</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features4-netconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- Controller -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-extras</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features4-netconf-connector</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features4-restconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- ODL Parent -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal-benchmark</artifactId>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features4-akka</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- Dlux -->
         <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>features4-dlux</artifactId>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features4-odlparent</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
 
-        <!-- Dlux Apps -->
+        <!-- FIXME: Add Yangtools -->
+
+        <!-- Higher offsets, temporarily removed due to Bug 8625 -->
+
+        <!-- BGPCEP -->
+        <!--
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>features4-dluxapps</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-bgp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- InfraUtils -->
         <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>infrautils-features4</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-bmp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-bgpcep-extras</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf-connector</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-pcep</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-restconf</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-rsvp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
-        <!-- ODL Parent -->
+        <!-- Dlux -->
+        <!--
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-akka</artifactId>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>features4-dlux</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
+
+        <!-- Dlux Apps -->
+        <!--
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-odlparent</artifactId>
+            <groupId>org.opendaylight.dluxapps</groupId>
+            <artifactId>features4-dluxapps</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- OpenFlow Plugin -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features4-openflowplugin</artifactId>
@@ -212,22 +227,27 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- SNMP -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.snmp</groupId>
             <artifactId>features4-snmp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- SXP -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.sxp</groupId>
             <artifactId>features4-sxp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
     </dependencies>
 </project>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 0aa8d71b..e69f10f2 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -86,6 +86,7 @@
             <classifier>features</classifier>
         </dependency>
         -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-pcep</artifactId>
@@ -98,14 +99,17 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- Dlux -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>odl-dlux-core</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- Netconf -->
         <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
@@ -124,28 +128,34 @@
         </dependency>
 
         <!-- OpenFlow Plugin -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- SNMP -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <dependency>
             <groupId>org.opendaylight.snmp</groupId>
             <artifactId>odl-snmp-plugin</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- SXP -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <dependency>
             <groupId>org.opendaylight.sxp</groupId>
             <artifactId>odl-sxp-controller</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
     </dependencies>
 </project>
diff --git a/features3-distribution/pom.xml b/features3-distribution/pom.xml
deleted file mode 100644
index 9eaaeb85..00000000
--- a/features3-distribution/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2016-2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.9.0</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <artifactId>features3-distribution</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Sub-project building features internal to distribution.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features3-distribution;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <!-- Version module. -->
-        <!-- Keep distribution-atrifacts updated. -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>version</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>version</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-        <!-- Dependencies on upstream feature repositories. -->
-        <!-- Keep upstream-atrifacts updated. -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-config-persister</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features3-distribution/src/main/features/features.xml b/features3-distribution/src/main/features/features.xml
deleted file mode 100644
index f98959f9..00000000
--- a/features3-distribution/src/main/features/features.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-integration-distribution-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
-
-    <feature name='odl-distribution-version' version='${project.version}'>
-        <feature>odl-config-startup</feature>
-        <bundle>mvn:org.opendaylight.integration/version/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/odl-version.xml">mvn:org.opendaylight.integration/version/{{VERSION}}/xml/config</configfile>
-    </feature>
-</features>
diff --git a/features3-index/pom.xml b/features3-index/pom.xml
deleted file mode 100644
index 5ab57b78..00000000
--- a/features3-index/pom.xml
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.9.0</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <!-- TODO: Rename to features-index when migrating to Karaf 4. -->
-    <artifactId>features-integration-index</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Sub-project gathering feature repositories of all ODL projects participating in distribution.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features-index;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <!-- Keep upstream-artifacts updated. -->
-    <dependencies>
-        <!-- Feature repository dependencies from this project. -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>features3-distribution</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <!-- Feature repository dependencies from other ODL projects. -->
-        <!-- TODO: Use comment lines to separate ODL project blocks? -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-shiro</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.alto</groupId>
-            <artifactId>features-alto-release</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <!-- bgpcep has issues bumping odlparent version
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features-bgp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features-bmp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features-pcep</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features-rsvp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.bier</groupId>
-            <artifactId>features-bier</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.cardinal</groupId>
-            <artifactId>cardinal-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-benchmark</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.didm</groupId>
-            <artifactId>features-didm</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.didm</groupId>
-            <artifactId>features-didm-hp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.didm</groupId>
-            <artifactId>features-didm-ovs</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>features-dlux</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>features-dluxapps</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.eman</groupId>
-            <artifactId>eman-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.faas</groupId>
-            <artifactId>features-faas</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.federation</groupId>
-            <artifactId>federation-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.genius</groupId>
-            <artifactId>genius-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.groupbasedpolicy</groupId>
-            <artifactId>features-groupbasedpolicy</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.honeycomb.vbd</groupId>
-            <artifactId>vbd-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>infrautils-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.iotdm</groupId>
-            <artifactId>iotdmcsitdist-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>features-l2switch</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.lacp</groupId>
-            <artifactId>features-lacp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.lispflowmapping</groupId>
-            <artifactId>features-lispflowmapping</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.nemo</groupId>
-            <artifactId>nemo-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-netconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-netconf-connector</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netvirt</groupId>
-            <artifactId>vpnservice-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netide</groupId>
-            <artifactId>netide-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.neutron</groupId>
-            <artifactId>features-neutron</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.nic</groupId>
-            <artifactId>features-nic</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ocpplugin</groupId>
-            <artifactId>features-ocpplugin</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-akka</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-odlparent</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.of-config</groupId>
-            <artifactId>features-of-config</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features-openflowplugin</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features-openflowplugin-he</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features-openflowplugin-extension</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features-openflowplugin-extension-he</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>library-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>southbound-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ovsdb</groupId>
-            <artifactId>hwvtepsouthbound-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>features-packetcable-policy</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sdninterfaceapp</groupId>
-            <artifactId>features-sdninterfaceapp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>features-sfc</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.snmp</groupId>
-            <artifactId>features-snmp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <!-- Commented out because https://bugs.opendaylight.org/show_bug.cgi?id=8409
-        <dependency>
-            <groupId>org.opendaylight.snmp4sdn</groupId>
-            <artifactId>features-snmp4sdn</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.topoprocessing</groupId>
-            <artifactId>features-topoprocessing</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.tsdr</groupId>
-            <artifactId>features-tsdr</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ttp</groupId>
-            <artifactId>features-ttp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <!-- Removing on 5/23/17 b/c of compilation failures
-        <dependency>
-            <groupId>org.opendaylight.unimgr</groupId>
-            <artifactId>unimgr-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.usc</groupId>
-            <artifactId>usc-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>features-vtn-manager</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
deleted file mode 100644
index c90b1fef..00000000
--- a/features3-index/src/main/features/features.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014,2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-integration-index-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <!--
-        Concept:
-            This file is a registry of feature repos defined in the projects.
-
-            The intent is to provide a single usable index that will pull in all available features in ODL.
-
-            No features should be defined here, only <repositories> should be listed.
-
-        Directions:
-            1) Make sure your feature file is running the tests and passing them in master:
-                https://wiki.opendaylight.org/view/Karaf:Hands_On_Guide#Existing_Feature_Files
-            2) Add your <repository> below
-            3) Go to the ../pom.xml and
-                a)  Add a dependency for your feature
-                b)  DO NOT ADD ANYTHING TO THE BOOTFEATURES.
-    -->
-
-
-    <!-- Please add new repository in an alphabetical order -->
-    <repository>mvn:org.opendaylight.aaa/features-aaa/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.alto/features-alto-release/{{VERSION}}/xml/features</repository>
-    <!-- bgpcep has issues bumping odlparent version
-    <repository>mvn:org.opendaylight.bgpcep/features-bgp/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-bmp/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-extras/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-pcep/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
-    -->
-    <repository>mvn:org.opendaylight.bier/features-bier/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.cardinal/cardinal-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/features-didm/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/features-didm-hp/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.didm/features-didm-ovs/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.eman/eman-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.faas/features-faas/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.federation/federation-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.genius/genius-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.honeycomb.vbd/vbd-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.infrautils/infrautils-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.integration/features3-distribution/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.iotdm/iotdmcsitdist-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.lacp/features-lacp/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.nemo/nemo-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-netconf/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netide/netide-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netvirt/vpnservice-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.nic/features-nic/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.odlparent/features-akka/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.of-config/features-of-config/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension-he/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/library-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sfc/features-sfc/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.snmp/features-snmp/{{VERSION}}/xml/features</repository>
-    <!-- Commented out because https://bugs.opendaylight.org/show_bug.cgi?id=8409
-    <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/{{VERSION}}/xml/features</repository>
-    -->
-    <repository>mvn:org.opendaylight.sxp/features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.tsdr/features-tsdr/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
-    <!-- Removing on 5/23/17 b/c of compilation failures
-    <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
-    -->
-    <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.vtn/features-vtn-manager/{{VERSION}}/xml/features</repository>
-</features>
diff --git a/features3-test/pom.xml b/features3-test/pom.xml
deleted file mode 100644
index f858abd6..00000000
--- a/features3-test/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.9.0</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.opendaylight.integration</groupId>
-    <!-- TODO: Rename to features-test when migrating to Karaf 4. -->
-    <artifactId>features-integration-test</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>Sub-project building aggregate features used for feature compatibility testing.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=features-test;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <!-- Dependencies on feature repos. -->
-        <dependency>
-            <groupId>org.opendaylight.integration</groupId>
-            <artifactId>features-integration-index</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
deleted file mode 100644
index b36878d6..00000000
--- a/features3-test/src/main/features/features.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-integration-test-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <!--
-        Concept:
-            This file is a registry of features defined in the projects for use in integration testing.
-
-            The intent is to capture high level (not low level features).  This means a project
-            may have features that are not listed here.  That is fine.  Only the stuff you think
-            end users would want to install should be indexed here.
-
-            There are two kinds of features defined here:
-
-            odl-integration-compatible-with-all - to list high level features that don't have compatibility
-                issues
-
-            odl-integration-all - to list all features available in OpenDaylighthigh level features
-                that have compatibility issues with some other features.  This feature includes
-                odl-integration-compatible-with-all
-
-        Directions:
-            1) Make sure your feature file is running the tests and passing them in master:
-                https://wiki.opendaylight.org/view/Karaf:Hands_On_Guide#Existing_Feature_Files
-            2) Add your <repository> to integration/features/index/src/main/resources/features.xml
-            3) If and ONLY if your top level feature is compatible with everything, add it to
-                odl-integration-compatible-with-all
-            4) If and ONLY if your top level feature is incompatible with other things, add it to
-                odl-integration-all
-            5) Go to the ../pom.xml and
-                a)  Add a dependendy for your feature
-                b)  DO NOT ADD ANYTHING TO THE BOOTFEATURES.
-
-            Important note: None of the features defined in this file will be in the integration/karaf build by default
-                            because that is what we ship, and test features should not by default ship.
-                            Please be aware that the features pulled in via features-integration-repo from the projects
-                            *will* be.  Its only these aggregating test features that will be missing.
-                            If you need to have these test features defined in this file (for example if you are doing
-                            integration testing) then:
-                            cd integration/distributions/karaf
-                            perl -i -pe "s/features-integration-index/features-integration-test/" target/assembly/etc/org.apache.karaf.features.cfg
-                            and they will be present and availble
-    -->
-    <!-- The features-integration-index should be the one and only repository in this file.
-        If you think another repository is needed, please add it to integration/features/index/src/main/resource/features.xml
-    -->
-    <repository>mvn:org.opendaylight.integration/features-integration-index/{{VERSION}}/xml/features</repository>
-
-    <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <!-- Please use alphabetical order to add a compatible with all features -->
-        <feature>odl-aaa-shiro</feature>
-        <feature>odl-aaa-netconf-plugin</feature>
-        <!-- bgpcep has issues bumping odlparent version
-        <feature>odl-bgpcep-bgp</feature>
-        <feature>odl-bgpcep-bmp</feature>
-        <feature>odl-bgpcep-pcep</feature>
-        <feature>odl-bgpcep-rsvp</feature>
-        -->
-        <feature>odl-cardinal</feature>
-        <feature>odl-didm-all</feature>
-        <feature>odl-dlux-core</feature>
-        <feature>odl-distribution-version</feature>
-        <feature>odl-eman</feature>
-        <feature>odl-eman-rest</feature>
-        <feature>odl-eman-ui</feature>
-        <feature>odl-lispflowmapping-msmr</feature>
-        <feature>odl-lispflowmapping-ui</feature>
-        <feature>odl-mdsal-benchmark</feature>
-        <feature>odl-mdsal-broker</feature>
-        <feature>odl-nemo-engine</feature>
-        <feature>odl-nemo-engine-rest</feature>
-        <feature>odl-nemo-engine-ui</feature>
-        <!-- Failed netide merge job makes distribution fail
-        <feature>odl-netide-rest</feature>
-        <feature>odl-netide-app</feature>
-        -->
-        <feature>odl-neutron-service</feature>
-        <feature>odl-ocpplugin-all</feature>
-        <feature>odl-openflowplugin-flow-services</feature>
-        <feature>odl-openflowplugin-flow-services-rest</feature>
-        <feature>odl-openflowplugin-flow-services-ui</feature>
-        <feature>odl-openflowplugin-nxm-extensions</feature>
-        <feature>odl-ovsdb-hwvtepsouthbound</feature>
-        <feature>odl-ovsdb-library</feature>
-        <feature>odl-ovsdb-southbound-impl</feature>
-        <feature>odl-packetcable-policy-server-all</feature>
-        <feature>odl-restconf-noauth</feature>
-        <feature>odl-sdninterfaceapp-all</feature>
-        <feature>odl-sfc-netconf</feature>
-        <feature>odl-sfc-ovs</feature>
-        <feature>odl-sfc-sb-rest</feature>
-        <feature>odl-sfc-test-consumer</feature>
-        <feature>odl-sfc-ui</feature>
-        <feature>odl-sfclisp</feature>
-        <feature>odl-sxp-controller</feature>
-        <feature>odl-snmp-plugin</feature>
-        <!-- Issues with yang parser show up in aaa distribution-check
-        <feature>odl-snmp4sdn-all</feature>
-        -->
-        <feature>odl-topoprocessing-i2rs</feature>
-        <feature>odl-topoprocessing-inventory</feature>
-        <feature>odl-topoprocessing-inventory-rendering</feature>
-        <feature>odl-topoprocessing-mlmt</feature>
-        <feature>odl-topoprocessing-network-topology</feature>
-        <feature>odl-ttp-model</feature>
-        <feature>odl-usc-channel</feature>
-        <feature>odl-usc-channel-rest</feature>
-        <feature>odl-usc-channel-ui</feature>
-    </feature>
-
-    <feature name='odl-integration-all' version='${project.version}'>
-        <!-- Please use alphabetical order for non-compatible features -->
-        <feature>odl-alto-release</feature>
-        <!-- bgpcep has issues bumping odlparent version and bier uses bgpcep
-        <feature>odl-bier-all</feature>
-        -->
-        <feature>odl-faas-base</feature>
-        <feature>odl-genius-rest</feature>
-        <feature>odl-groupbasedpolicy-faas</feature>
-        <feature>odl-groupbasedpolicy-iovisor</feature>
-        <feature>odl-groupbasedpolicy-neutronmapper</feature>
-        <feature>odl-groupbasedpolicy-neutron-and-ofoverlay</feature>
-        <feature>odl-groupbasedpolicy-neutron-vpp-mapper</feature>
-        <feature>odl-groupbasedpolicy-ne-location-provider</feature>
-        <feature>odl-groupbasedpolicy-ofoverlay</feature>
-        <feature>odl-groupbasedpolicy-sxp-ep-provider</feature>
-        <feature>odl-groupbasedpolicy-ui</feature>
-        <feature>odl-groupbasedpolicy-vpp</feature>
-        <feature>odl-integration-compatible-with-all</feature>
-        <!-- Commenting this feature due to an issue with Jetty server
-        <feature>odl-iotdmcsitdist</feature>
-        -->
-        <feature>odl-l2switch-switch</feature>
-        <feature>odl-l2switch-switch-rest</feature>
-        <feature>odl-l2switch-switch-ui</feature>
-        <feature>odl-lacp-ui</feature>
-        <!-- The following two Netconf features are incompatible with each other.
-        As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
-        <feature>odl-netconf-clustered-topology</feature>
-        <feature>odl-netconf-connector-ssh</feature>
-        <feature>odl-netvirt-openstack</feature>
-        <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
-            which leads to BindException.
-        <feature>odl-nic-core-mdsal</feature>
-        -->
-        <feature>odl-of-config-all</feature>
-        <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
-        <feature>odl-sfc-ios-xe-renderer</feature>
-        -->
-        <feature>odl-sfc-openflow-renderer</feature>
-        <feature>odl-tsdr-hsqldb-all</feature>
-        <!-- Removing on 5/23/17 b/c of compilation failures
-        <feature>odl-unimgr</feature>
-        -->
-        <feature>odl-vtn-manager-neutron</feature>
-        <feature>odl-vtn-manager-rest</feature>
-    </feature>
-
-</features>
diff --git a/pom.xml b/pom.xml
index be817592..51a9980d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,11 +42,7 @@
         <!-- Keep this list sorted alphabetically please -->
         <module>artifacts</module>
         <module>karaf</module>
-        <module>distribution-karaf</module>
         <module>features</module>
-        <module>features3-distribution</module>
-        <module>features3-index</module>
-        <module>features3-test</module>
         <module>version</module>
     </modules>
 </project>
-- 
2.36.6