avoid naming clashes
Merge branch 'rpcproxy'
version bump
Merge remote-tracking branch 'origin/master' into events-tests-with-real-rabbit