ACCUMULO-998 applying Micheal Allen's updated patch for at-rest encryption

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502316 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 increase timeouts, fix TableIT

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502336 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 fix static cluster/folder in MacTest

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502343 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 fixed NPE in MAC

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502381 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'apache/trunk' into ACCUMULO-1030