Make IPC process handle as many as sites as you want in threads.
Merge remote-tracking branch 'origin/ENG-4515-newjson' into threaded-ipc
Remove some mac-specific-debugging code.
Merge remote-tracking branch 'origin/master' into threaded-ipc
Fix whitespace.
Merge remote-tracking branch 'origin/master' into threaded-ipc

Conflicts:
	src/ee/voltdbipc.cpp
	src/frontend/org/voltdb/ExecutionSite.java
Merge remote-tracking branch 'origin/master' into threaded-ipc

Conflicts:
	src/ee/storage/ElasticScanner.cpp
	tests/frontend/org/voltdb/regressionsuites/LocalCluster.java
Merge remote-tracking branch 'origin/master' into threaded-ipc
For ENG-5152, move the watch processing into the appropriate thread
ENG-5145: Make CPP code compile.
EENG-5145: Minor tweaks to threaded-ipc branch to prep for tests/review.
Fix failing TestCollector because the symlinked /tmp on volt4b breaks it
Builds from git tags now go to top-level, not one-offs.
Merge pull request #755 from VoltDB/ENG-5152

For ENG-5152, Fix ZK from wrong thread in on server export startup
EENG-5145: Replace code that got removed during a merge.
Add minor update to UsingVoltDB
ENG-5145: Fix licensecheck.
Merge remote-tracking branch 'origin/master' into threaded-ipc
ENG-5145: pmartel feedback
ENG-5145: Hopefully fix Valgrind results.