Revert "Get rid of unneeded whoosh and haystack config options."

This reverts commit 5468e51701e652a1ede041c05f4d5b43a17fe3c6.
Revert "Revert "Get rid of unneeded whoosh and haystack config options.""

This reverts commit 2edb546c5bc369a7646a99a9b3268c6298959940.
Revert "Get rid of unneeded whoosh and haystack config options."

This reverts commit 5468e51701e652a1ede041c05f4d5b43a17fe3c6.
Resolved merge conflicts