ACCUMULO-1809 parse short args and use reflection tricks to update counters
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'