Merge "[DCAEGEN2] Fix PM-Mapper Feed configuration issue"