Bug 420160: Add support for Maven 3.1.x