[BABEL-5675] Fix babelfish dumpall after community 16eff4261f

Community commit 16eff4261f changed query to fetch role membership which
is duplicated in dumpall_babel_utils.c file so this commit updates the
duplicated query accordingly.

cr: https://code.amazon.com/reviews/CR-183415429

Author: ritanwar

src/bin/pg_dump/dumpall_babel_utils.c

@@ -309,10 +309,12 @@ getBabelfishRoleMembershipQuery(PGconn *conn, PQExpBuffer buf,
 					  "bbf_roles AS (SELECT rc.* FROM %s rc INNER JOIN bbf_catalog bcat "
 					  "ON rc.rolname = bcat.rolname) ", role_catalog);
 
-	appendPQExpBufferStr(buf, "SELECT ur.rolname AS roleid, "
+	appendPQExpBufferStr(buf, "SELECT ur.rolname AS role, "
 						 "um.rolname AS member, "
 						 "a.admin_option, "
-						 "ug.rolname AS grantor "
+						 "ug.rolname AS grantor, "
+						 "a.roleid AS roleid, "
+						 "a.member AS memberid "
 						 "FROM pg_auth_members a "
 						 "INNER JOIN bbf_roles ur on ur.oid = a.roleid "
 						 "INNER JOIN bbf_roles um on um.oid = a.member "