Merge branch '11345-nodemanager-retry-after' refs #11345
authorPeter Amstutz <peter.amstutz@curoverse.com>
Sat, 10 Jun 2017 01:30:44 +0000 (21:30 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Sat, 10 Jun 2017 01:30:44 +0000 (21:30 -0400)

Trivial merge