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

* commit 'dda456b5da3d59a71b486aa85912dec65b3089b2':
  Kill of most of the remainder of minadbd.