ACCUMULO-2670 Fix license header
Merge branch '1.6.0-SNAPSHOT'