Fix 9.2 conflicts for 'Resolve "Assignee dropdown does not display selected assignee"'
- Encountered conflicts while picking !1968 (merged) onto
9-2-stable-ee
- Please fix the conflicts and merge this into
9-2-stable-ee
/cc @iamphill
9-2-stable-ee
9-2-stable-ee
/cc @iamphill