Try to make the complex orchestration of swift more solid

There are several bits that can fail every now and then, depending on whether a node has multiple swift roles or not.

https://bugzilla.novell.com/show_bug.cgi?id=872518