Merge branch 'master' into slot2

diff --cc doc/src/sgml/config.sgml
Simple merge

diff --cc doc/src/sgml/func.sgml
Simple merge

diff --cc src/backend/catalog/system_views.sql
Simple merge

diff --cc src/backend/utils/misc/guc.c
Simple merge

diff --cc src/backend/utils/misc/postgresql.conf.sample
Simple merge

diff --cc src/include/catalog/pg_proc.h
Simple merge

diff --cc src/test/regress/expected/rules.out
Simple merge