move the user_id field to conditions#2405

hackmod wants to merge 2 commits intoxpressengine:developxpressengine/xe-core:developfrom

hackmod:user_id-condition-fixhackmod/xe-core:user_id-condition-fixCopy head branch name to clipboard