make logmerger read the new logfile packages
make it use directory paths if any filenames are identical
fix regex of server logs in logfile package
use meaningful filename for tempfile in merge result
make regex more readable
modification on regex based on changes in log collector
ENG-5107: Java 1.6 -> 1.7 changes
ENG-5107: Remove concurrency classes backported from 1.7 to 1.6 and
just use the provided versions.
ENG-5292 better varchar(0) catching that infers varchar(MAX_LENGTH) in the right places -- needs junit specific to ENG-5292
Merge remote-tracking branch 'origin/release-3.7' into ENG-5292-matview-with-string-functions
Merge remote-tracking branch 'origin/master' into eng5107-java17

Conflicts:
	src/frontend/org/voltcore/utils/CoreUtils.java
ENG-5292 Add junit test and remove training wheels to allow multiple VARCHAR(MAX_LENGTH) columns.
Merge remote-tracking branch 'origin/release-3.7' into ENG-5292-matview-with-string-functions
Fix ENG-5310 and add tests.
licensecheck
Merge remote-tracking branch 'origin/release-3.7' into ENG-5292-matview-with-string-functions
Restore row size safety feature (for now) -- replace with a 2K limit on mat view col size.
remove unnecessary assert.
count batches submitted and wait for batch ack before putting end on failureQueue.
Merge branch 'release-3.7' into ENG-5310-last-batch-drain