SERVER-4532 can't call ClientInfo::addShard on things you don't really use

Conflicts:

	src/mongo/s/s_only.cpp
bump version to 2.2.2-fs-d