Updated role hierarchy to allow merging of roles from the security yml