ACCUMULO-1404,ACCUMULO-1423 merge to trunk
ACCUMULO-1404,ACCUMULO-1423 merge to trunk

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

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