Merge remote-tracking branch 'origin/es_new_data'
Fixed tests
Remove links to construct docs for now; per Eurie.
Use parent process id, that of the apache process.
Merge remote-tracking branch 'origin/master' into es_new_data