ACCUMULO-1504 Applying patch from Miguel. Added a few extra tests too.


git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1494797 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-935 re-add accidentally removed empty directory

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1494806 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1504 Merge Miguel's changes from 1.4 to 1.5


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1494818 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1504 Final merge from 1.5 to trunk to resolve the duplicate add I caused in the first place with Miguel's patch


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