Merge branch '11413-nodemanager-gce-fixes' refs #11413
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Apr 2017 13:05:41 +0000 (09:05 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Apr 2017 13:05:41 +0000 (09:05 -0400)

Trivial merge