(BugID: 94861) Make sure this LU will still work on uncyc

Since uncyc doesn't use ExternalUser, need to fall back to local
user object when ExternalUser isn't in use.
Merge branch 'bugid-94861' into dev