NXP-10905 align on master pom changes