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 'VoltDB/master' into ENG-3038
sqlcoverage revamp
sqlcoverage revamp new scripts and scriptlets
Merge remote-tracking branch 'origin/ENG-3038-merge-join-code-paths' into sqlcoveragereal
Merge remote-tracking branch 'origin/ENG-3038' into sqlcoveragereal
sqlcoverage tweak
Merge branch 'master' into sqlcoverage-next

Conflicts:
	tests/scripts/examples/sql_coverage/join-template.sql
licensecheck
Merge branch 'sqlcoverage-next' of github.com:VoltDB/voltdb into sqlcoverage-next
Beefed up sqlcoverage testing of new 2-table join syntax.
Prohibit NLJ/IndexScan plans where index scan is distributed and based on inner-outer expression
Merge branch 'eng_3038_merge' into sqlcoverage-next

Conflicts:
	tests/scripts/examples/sql_coverage/basic-joins.sql
	tests/scripts/examples/sql_coverage/join-template.sql
Merge remote-tracking branch 'origin/eng_3038_merge' into sqlcoverage-next
Simplify sqlcoverage join-template to focus on error queries and very similar working queries.