SERVER-15614 Remove cc() references from d_concurrency.
SERVER-15375 remove initShardVersion
Merge remote-tracking branch 'upstream/master'