Merge develop changes to master

autovacuum settings that can only be set in postgres.conf, reduce default work_mem to 64MB, plus small tweaks

enabled an automatic merge when all merge checks for 041d6eb8 pass

merged