Merge branch '7286-nodeman-destroy-broken-nodes' closes #7286
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Oct 2015 13:17:30 +0000 (09:17 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Oct 2015 13:17:43 +0000 (09:17 -0400)

Trivial merge