Merge pull request #3062 from nrwahl2/nrwahl2-fixes
Various cleanups and fixes: mostly libcib, based, and controller