Exit SwitchableRouterImpl correctly when lock acquisition was interrupted
Merge remote-tracking branch 'origin/master'