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

* commit '552fceb85cde45581ef04a23a2e76e6298ed15a5':
  Kill of most of the remainder of minadbd.