Fixes #4536 Get the remote_user from multiple sources in a preferred order
Merge remote-tracking branch 'upstream/devel' into devel