pgsql: Prevent ALTER USER f RESET ALL from removing the settings that

Log Message:
-----------
Prevent ALTER USER f RESET ALL from removing the settings that were put there
by a superuser -- "ALTER USER f RESET setting" already disallows removing such a
setting.

Apply the same treatment to ALTER DATABASE d RESET ALL when run by a database
owner that's not superuser.

Tags:
----
REL8_4_STABLE

Modified Files:
--------------
pgsql/src/backend/commands:
dbcommands.c (r1.225 -> r1.225.2.1)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/commands/dbcommands.c?r1=1.225&r2=1.225.2.1)
user.c (r1.187 -> r1.187.2.1)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/commands/user.c?r1=1.187&r2=1.187.2.1)
pgsql/src/backend/utils/misc:
guc.c (r1.505.2.5 -> r1.505.2.6)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/utils/misc/guc.c?r1=1.505.2.5&r2=1.505.2.6)
pgsql/src/include/utils:
guc.h (r1.102.2.2 -> r1.102.2.3)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/include/utils/guc.h?r1=1.102.2.2&r2=1.102.2.3)