Merge "Fixes Bug 2935"
drwxr-xr-x - opendaylight