updating poms for 2.1.0.1-SNAPSHOT development
updating poms for branch'release-2.1.0.0' with non-snapshot versions
Merge branch 'release-2.1.0.0'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state