Merging ACCUMULO-585
Merging ACCUMULO-585



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

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