Merge "Adding support for different Mapper versions in IComposer VTS tests"