Merge branch 'CURATOR-498'
authorrandgalt <randgalt@apache.org>
Mon, 11 Feb 2019 12:47:18 +0000 (07:47 -0500)
committerrandgalt <randgalt@apache.org>
Mon, 11 Feb 2019 12:47:18 +0000 (07:47 -0500)

Trivial merge