Merge branch 'STORM-3233-revert-1.1.x' of https://github.com/revans2/incubator-storm into 1.1.x-branch

Revert "[STORM-3233] Updated zookeeper client to version 3.4.13 which…"

This closes #2870