Merge "Shift opendaylight role out of controller"