Merge "Fix: don't hardcode admin role name, use config option instead"