Merge pull request #1 from ctubbsii/ACCUMULO-802

Accumulo 802
ACCUMULO-802 cleaned up code after auto-format smashed it all together
ACCUMULO-1481 remove warning from the shell when flushing !METADATA, since it no longer applies
Merge remote-tracking branch 'asf/master' into ACCUMULO-802