Revert "refactor(postgresq): switch to 'include_dir' and then rename conf files to ensure ordering"

Revert "refactor(postgresq): switch to 'include_dir' and then rename conf files to ensure ordering" #3549