Fix pom files after bad cherry-pick of NXP-10947 from master