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

Change-Id: I9693e09a8e2e7c93383b7a7f7208edaa158a67ca