Bit of import and javadoc cleaning.
Made ensureNumberOfHarvests timeout in system test dependent on the number of harvests to run.
Merge branch 'master' into NICL