ACCUMULO-970 Removed and deprecated thrift enum from public API and fixed breakage between 1.4 and 1.5 API