Merge pull request #286 from wajam/clement-tx-delta

Change order of ConsistencyMasterSlave parameters
Undo merge that WASN'T ready to be done YET!
Merge pull request #287 from wajam/manu-undo-stupid-merge

Undo merge that WASN'T ready to be done YET!
Revert "Merge pull request #287 from wajam/manu-undo-stupid-merge"

This reverts commit 33333378cb310a89969a48b252064f6b3cd4549a, reversing
changes made to b3f0100a8272d83b5b07c081af2b734f9767ac71.