ACCUMULO-1537 fix build for hadoop-2
ACCUMULO-1545 Switch to UTF-8 Charset constant instead of string literals