Merge "update DMaaP ZooKeeper version"