Merge branch 'CURATOR-45' of https://git-wip-us.apache.org/repos/asf/incubator-curator into CURATOR-45