ACCUMULO-3289 Had made a final change that didn't get pushed.
ACCUMULO-3337 Pull back the amt of data written by default and increase timeout.

Can make scaling factor for data written when standalone cluster support is finalized.
ACCUMULO-3338 Add some extra classpath entries for necessary component jars.
Merge branch '1.6'
unbreaking build; trivial change