CORE-622 resolving conflicts when possible, but warning users when not possible
CORE-622 fixing in_array helper to live bind properly, fixes checkboxes not updating checked property on model refresh
Merge pull request #2034 from reciprocity/feature/CORE-622-sporadic-task-error

CORE-622 Resolve conflicts better when changing checkboxes in CTGOT