Merge "Update match-role-set config doc"