Merge change 4287 into donut

* changes:
  Sketch out a 'bmgr' command line tool