SERVER-15547 move gridfs sharding test to the "tool" tests
Merge remote-tracking branch 'upstream/master'