Merge "Update PostgreSQL createuser example" into stable-2.6