Merge "Adding IdManager/LockManager and related Changes"

diff --cc features/pom.xml
index 4b109efef00aba75c018f683c749296273b8de12,8433fba5543c5eb36d588f17cebbb029ff7baeb7..72b6f763b1ebb67b403cb6346c7f100593871de0
--- 1/features/pom.xml
--- 2/features/pom.xml
+++ b/features/pom.xml
@@@ -33,8 -33,8 +33,9 @@@ and is available at http://www.eclipse.
      <interfacemgr.version>${vpnservices.version}</interfacemgr.version>
      <nexthopmgr.version>${vpnservices.version}</nexthopmgr.version>
      <fibmanager.version>${vpnservices.version}</fibmanager.version>
+     <lockmanager.version>${vpnservices.version}</lockmanager.version>
      <idmanager.version>${vpnservices.version}</idmanager.version>
 +      <itm.version>${vpnservices.version}</itm.version>
    </properties>
    <dependencyManagement>
      <dependencies>

diff --cc features/src/main/features/features.xml
Simple merge

diff --cc pom.xml
index 561d19de90ffb13d864810c26326976249ac951a,f090c5698dc88d708bb90b5abe1d646e1c403f51..d19242065c1a5e122a7f1acb99154d1df9787879
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -23,10 -25,8 +25,9 @@@ and is available at http://www.eclipse.
      <module>vpnmanager</module>
      <module>interfacemgr</module>
      <module>nexthopmgr</module>
-     <module>idmanager</module>
      <module>fibmanager</module>
      <module>bgpmanager</module>
 +    <module>itm</module>
      <module>distribution/karaf</module>
      <module>features</module>
      <module>vpnservice-artifacts</module>