ACCUMULO-1544 - removing username flag and use from init/MAC
Merging ACCUMULO-1544 forward (even though no changes needed to be propogated)