HELP-14177: when using IP auth for trunkstore attempt to look up the user flags by DID
Merge remote-tracking branch 'upstream/3.16' into 3.16