Merge branch 'CURATOR-447'
authorScott Blum <dragonsinth@apache.org>
Tue, 13 Feb 2018 00:55:13 +0000 (19:55 -0500)
committerScott Blum <dragonsinth@apache.org>
Tue, 13 Feb 2018 00:55:13 +0000 (19:55 -0500)

Trivial merge