[TIMOB-11919] Added support for the new Titanium module conflict detection.
Merge pull request #3729 from cb1kenobi/timob-11919

[TIMOB-11919] Added support for the new Titanium module conflict detecti...