Added missing m2e plugin exec mappings
Merge remote-tracking branch 'origin/master' into upgrade-hc4