Topology reconfiguration fixes

Patch by Blake Eggleston; Reveiewed by Benedict Elliott Smith
47 files changed