SERVER-12515 Unable to move hashed shard key chunks created by numInitialChunks

Backport fix for commit 3a08be3bf2a1a650c97543a448a8ea0c143a89b6
Merge remote-tracking branch 'upstream/v2.4' into v2.4