Merge branch '9818-logstash'
authorTom Clegg <tom@curoverse.com>
Mon, 22 Aug 2016 17:06:58 +0000 (13:06 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 22 Aug 2016 17:06:58 +0000 (13:06 -0400)
refs #9818
refs #9709


Trivial merge