CLC-2472 - Add acting_as_uid
https://jira.media.berkeley.edu/jira/browse/CLC-2472
Merge pull request #1535 from christianv/CLC-2472

CLC-2472 - Add acting_as_uid