Refs #5217: Master to roles