Bug 6358 - Fix merge parents 16/43316/2
-rw-r--r-- 495 .gitignore
-rw-r--r-- 87 .gitreview
drwxr-xr-x - docs
drwxr-xr-x - features
drwxr-xr-x - karaf
drwxr-xr-x - netconf
-rw-r--r-- 4135 pom.xml
drwxr-xr-x - restconf