Code cleanup.
Creating Grant and GroupMembership relationships when a GroupRole is added.
Merge remote-tracking branch 'upstream2/master'