Fix citext's upgrade-from-unpackaged script to set its collation correctly.

Fix citext's upgrade-from-unpackaged script to set its collation correctly.

Although there remains some debate about how CREATE TYPE should represent
the collation property, this doesn't really affect what we need to do in
citext's script, so go ahead and fix that.