Merge changes I98276170,I77b1d470
-rw-r--r-- 447 .gitignore
drwxr-xr-x - features
drwxr-xr-x - karaf
drwxr-xr-x - opendaylight
-rw-r--r-- 9684 pom.xml