CRUNCH-364: Fix failure on mvn dependency:tree
Merge branch 'crunch-364'
CRUNCH-351: Impove performance of Shard#shard().