Merge "Adding TSDR features to integration project."

diff --cc features/index/pom.xml
Simple merge

diff --cc features/test/src/main/resources/features.xml
index 0eb976f53f521ca4986813c2ce4151cb68028918,d2c394300fa22d98d68c3f1ce478162602a361b6..da9fed4815186bd5c79223d59e6f884ebc764f87
--- 1/features/test/src/main/resources/features.xml
--- 2/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@@ -121,8 -122,8 +121,9 @@@
          <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
          <!--<feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>-->
          <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
+         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
          <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
 +        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
      </feature>
  
  </features>