there are some conflicts, so I am not very sure if my cherry-pick is right. I would like @ivankelly and @merlimat to have a look to make sure my cherry-pick is correct.
[ Full content available at: https://github.com/apache/bookkeeper/pull/1618 ] This message was relayed via gitbox.apache.org for [email protected]
