Update the pom parent to 6.2.1
Merge branch 'update-pom' into eesc