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