ACCUMULO-2534 added license headers
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2487 eliminate warnings about unused vars
Merge branch '1.6.0-SNAPSHOT'