Refactoring POMs as per ODL Neon