Merge "Change legacy "persona" references to userid_t."