Preferred master 1.7

* [x] waiting for CI http://172.19.49.85/view/arakoon-git/job/arakoon-git-launcher/358/downstreambuildview/?

After that we probably want to do another backport...