Merge branch '9005-disable-keepalive'
authorTom Clegg <tom@curoverse.com>
Fri, 19 May 2017 23:17:22 +0000 (19:17 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 19 May 2017 23:17:22 +0000 (19:17 -0400)
refs #9005
refs #11726
refs #11729


Trivial merge