map-controller: rebase fixes

src/core/cntlr.c

src/core/cntlr_cmdu_generator.c

src/core/cntlr_map.c

src/core/cntlr_map_debug.c

src/core/cntlr_ubus.c