Merge "BUG-1281: optimize ControllerContext"
drwxr-xr-x - opendaylight