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

Change-Id: I1c52edfee963a404e29e2d2ace60771609c8541a