ACCUMULO-2037 quick test to verify locality, location state management
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2037 use the last location information
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2029 remove unnecessary import
Merge branch '1.6.0-SNAPSHOT'