PR merge

[zhangao]

Hi, Please take a look at this two issue, it has been for a lone time. I think 
it's ready to merge. 
https://github.com/apache/pulsar/pull/11893
https://github.com/apache/pulsar/pull/12025