Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/curator
authorrandgalt <randgalt@apache.org>
Tue, 13 Feb 2018 18:08:57 +0000 (13:08 -0500)
committerrandgalt <randgalt@apache.org>
Tue, 13 Feb 2018 18:08:57 +0000 (13:08 -0500)

Trivial merge