WL#2654: Federated - Make Mikael's changes to federated (table lock issues)

Affects: Server-7.1   —   Status: Assigned   —   Priority: Medium

Patrick, please fill this in.