ACCUMULO-2534 added license headers
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
ACCUMULO-2169 Update license headers
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT