Merged trunk to 0.10.0

[Gwen Shapira]

Hi Kafka Devs,

As you remember, I agreed to merge trunk to 0.10.0 branch on weekly
basis until the next RC to avoid burdening committers with double
commits.

I just merged latest trunk into 0.10.0 and pushed to apache.

Enjoy.

Gwen Shapira