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