Fixes #10430 Also removed redundant resolution of sudo/su for backwards compatibility which confused the conflict detection code.