Merge "[DCAEGEN2] Update PM-Mapper to 1.7.0"