ACCUMULO-865 applied patch from dave marion with sligh modifications
ACCUMULO-865 applied patch from dave marion with sligh modifications

git-svn-id: f2032a8f7e7e147e9bd2f47faaf2ba5297dc4bdd@1428571 13f79535-47bb-0310-9956-ffa450edef68

joshelser/accumulo,lstav/accumulo,ctubbsii/accumulo,joshelser/accumulo,mjwall/accumulo,joshelser/accumulo,phrocker/accumulo,ivakegg/accumulo,keith-turner/accumulo,phrocker/accumulo,keith-turner/accumulo,milleruntime/accumulo,adamjshook/accumulo,apache/accumulo,milleruntime/accumulo,mjwall/accumulo,mjwall/accumulo,mikewalch/accumulo,mikewalch/accumulo,lstav/accumulo,ivakegg/accumulo,phrocker/accumulo-1,phrocker/accumulo,wjsl/jaredcumulo,lstav/accumulo,wjsl/jaredcumulo,wjsl/jaredcumulo,mikewalch/accumulo,mikewalch/accumulo,joshelser/accumulo,milleruntime/accumulo,mjwall/accumulo,wjsl/jaredcumulo,dhutchis/accumulo,dhutchis/accumulo,mikewalch/accumulo,mjwall/accumulo,ctubbsii/accumulo,adamjshook/accumulo,dhutchis/accumulo,joshelser/accumulo,joshelser/accumulo,adamjshook/accumulo,adamjshook/accumulo,milleruntime/accumulo,ivakegg/accumulo,keith-turner/accumulo,phrocker/accumulo,keith-turner/accumulo,keith-turner/accumulo,keith-turner/accumulo,milleruntime/accumulo,phrocker/accumulo,phrocker/accumulo,adamjshook/accumulo,ivakegg/accumulo,phrocker/accumulo,adamjshook/accumulo,phrocker/accumulo-1,mikewalch/accumulo,apache/accumulo,joshelser/accumulo,dhutchis/accumulo,ctubbsii/accumulo,phrocker/accumulo-1,phrocker/accumulo,keith-turner/accumulo,lstav/accumulo,phrocker/accumulo-1,lstav/accumulo,lstav/accumulo,ivakegg/accumulo,mjwall/accumulo,ivakegg/accumulo,milleruntime/accumulo,phrocker/accumulo-1,mikewalch/accumulo,apache/accumulo,ivakegg/accumulo,phrocker/accumulo,mjwall/accumulo,dhutchis/accumulo,wjsl/jaredcumulo,phrocker/accumulo-1,apache/accumulo,joshelser/accumulo,wjsl/jaredcumulo,dhutchis/accumulo,adamjshook/accumulo,adamjshook/accumulo,lstav/accumulo,dhutchis/accumulo,apache/accumulo,phrocker/accumulo-1,dhutchis/accumulo,dhutchis/accumulo,apache/accumulo,wjsl/jaredcumulo,milleruntime/accumulo,adamjshook/accumulo,ctubbsii/accumulo,wjsl/jaredcumulo,ctubbsii/accumulo,apache/accumulo,ctubbsii/accumulo,mikewalch/accumulo,ctubbsii/accumulo