warehouse_pairing now makes all distributed transactions access local partitions
small fixes
Revert "small fixes"

This reverts commit 5f62e0f0b61995c551f36bfe148ca7121a61b53e.
Revert "warehouse_pairing now makes all distributed transactions access local partitions"
This and the previous commit are to revert changes related to warehouse_pairing and affinity.
These changes are now included in the branch pairing

This reverts commit 8d8cd73544d1971610a3b802173d8613e1caae52.