update parent
updating poms for branch '7.1' with snapshot versions
updating poms for branch'release/7.1' with non-snapshot versions
Merge branch 'release/7.1'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state