Merge "Remove PM Mapper jenkins job def"