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