Fix search shards count method when targeting concrete and routing-aliased indices
Added test for #3268 and comments to test for #2682
XContentHelper.mergeDefaults with single key object list ([ { key: .. } , {key : ... } .. ] ) didn't add defaults which were not already in content

 Closes #3538