Remove $this from closure in UserRoleMessage

Reworked a bit of code in UserRoleMessage to take into account that
PHP > 5.4 doesn't support $this in closures.

Change-Id: Id7978574e4d0f149d53934252c24f7cca4aa487f
Bug: 60641
Merge "Remove $this from closure in UserRoleMessage"