Merge "ref/roled: Change flag from using underscore to using hyphen."