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/branches/1.5@1467311 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1264 put delete markers for the METADATA table into the root tablet

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