Merge branch 'CURATOR-479-2' master
authorrandgalt <randgalt@apache.org>
Tue, 11 Dec 2018 19:21:20 +0000 (14:21 -0500)
committerrandgalt <randgalt@apache.org>
Tue, 11 Dec 2018 19:21:20 +0000 (14:21 -0500)

Trivial merge