Merge branch 'ROCKETMQ-57' of https://git-wip-us.apache.org/repos/asf/incubator-rocketmq into ROCKETMQ-57
