am 2d102225: Merge "Kill of most of the remainder of minadbd."

* commit '2d1022250941873f8748e6a159d4e5bf976e511f':
  Kill of most of the remainder of minadbd.