Merge pull request #422 from fpapon/AMQ-7351

[AMQ-7351] Update to Apache pom parent 21