[automerger skipped] Merge "Adding support for different Mapper versions in IComposer VTS tests" into qt-dev am: 29594d2d02 am: 624ce4b638
am: badb212836 -s ours
am skip reason: change_id I05e2832c64d4c06eb4afd64c3323d7edbd19a5f4 with SHA1 c1dc31340e is in history

Change-Id: I6933194d463983c17a6cc56fc5318d7cbb7ddeb5