Merge pull request #3196 from tchaikov/shadow-cct

client, librados, osdc: do not shadow Dispatcher::cct

Reviewed-by: Loic Dachary <ldachary@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/librados/RadosClient.cc
Simple merge

diff --cc src/librados/RadosClient.h
Simple merge

diff --cc src/osdc/Objecter.h
Simple merge