Implement user impersonation
Merge branch 'staging'
Fix entity issue
Remove app name for New Relic on staging
Fix trailing whitespace
Merge branch 'master' into staging