This isn't the root cause of the referenced bug, but it does prevent us from deactivating swap on md devices by making them appear to always be active. This should go on master and f22-branch.