Merge "Update to version 2.6.1 of parent pom"

No match.