Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.0

Conflicts:
	ingest/bin/ingest_parallel.sh
	ingest/pom.xml
	pom.xml
	query/pom.xml
tree: 27e214c02f266743f2d4f809bad3996d451cb408
  1. ingest/
  2. query/
  3. query-war/
  4. .gitignore
  5. pom.xml
  6. README
  7. README.parallel