ACCUMULO-3157 close scanners
Merge branch '1.5.3-SNAPSHOT' into 1.6.2-SNAPSHOT
ACCUMULO-3157 ACCUMULO-3158 Fix compilation issues and ensure scanner is closed.