Merge commit 'a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38' into v3-2-ctdb

Merge commit 'a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38' into v3-2-ctdb

This fake merge ("git merge -s ours a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38")
has the purpose making merges from test to v3-2-ctdb possible again.
It does not change the code, but only imports the refrence to one commit
up to which I had already synchronized the branches.
I could not merge any more because of conflicts due to the fact that
some things like Volker' idmap rewrite and support for ctdb transactions
had been imported into v3-2-ctdb but not into v3-2-test/stable.

Michael