SERVER-11332 minor cleanup of SCC and chunk diff timeout