Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/curator master
authorrandgalt <randgalt@apache.org>
Sat, 1 Sep 2018 14:40:43 +0000 (09:40 -0500)
committerrandgalt <randgalt@apache.org>
Sat, 1 Sep 2018 14:40:43 +0000 (09:40 -0500)

Trivial merge