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

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1467343 13f79535-47bb-0310-9956-ffa450edef68