Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1496 Use scannotation library to scan for launchable classes