Merge "Add PMMapper containter to e2e"