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