ACCUMULO-1285 account for files deleted regardless of how they are trashed/deleted

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1468947 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1285 account for files deleted regardless of how they are trashed/deleted

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