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

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