Merge branch '11235-log-retryable'
authorTom Clegg <tom@curoverse.com>
Wed, 29 Mar 2017 15:51:55 +0000 (11:51 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 29 Mar 2017 15:51:55 +0000 (11:51 -0400)
refs #11235


Trivial merge