Merge pull request #3180 from nrwahl2/nrwahl2-transactions
Move CIB transaction management to client and fix controller regression