Merge trunk#589

Matthias J. Sax (mjsax) merged 10 commits into

masterconfluentinc/kafka:masterfrom

merge-trunkconfluentinc/kafka:merge-trunkCopy head branch name to clipboard