Merge "Fix a few eclipse-reported warnings"
drwxr-xr-x - opendaylight