More POM tweaks to get MR jobs running correctly.