Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
ACCUMULO-3261 Don't set empty ranges on the BatchScanner.

If ScanMeta is called early enough in the module,
it's possible that it will find no hashes in the
Image table and would attempt to set empty
ranges on the BatchScanner which throws an error.
Merge branch '1.5' into 1.6
Merge branch '1.6'