OOIION-1585: permission to edit resources in one facility gives ability in all facilities
Merge pull request #1640 from mmeisinger/r2_fix

Fix accidental branch divergences
Merge pull request #1641 from pkediyal/OOIION-1585

OOIION-1585: permission to edit resources in one facility gives ability ...
OOIION-1609: Add process information to EventPublisher for actor_id