Merge "Adding support for different Mapper versions in IComposer VTS tests" into qt-dev am: 29594d2d02
am: 624ce4b638

Change-Id: Ic3f35cf18de427751dd5180467579c85b70ac5a5