Merge "Fix ShardTest#testCreateSnapshot unit test failures"