Cherry-picked commit edc6ed58587ddb12c7abecf536ef8794ddc3bfad from ingest-config branch
Cherry-picked commit 42ec4013ae5777200b37df69838bd85ea2253b2c
Additional modifications for backing out changes to IngestModuleAbstract.java from commit 5d9bf3ff1f78dfc967128c02356613a3a980f328
Merge in of GeneralIngestConfigurator, alternative 1
Merge in of GeneralIngestConfigurator, alternative 2
Merge of general_ingest_configurator branch