updating poms for 1.2-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
a
updating poms for branch'release/1.2' with non-snapshot versions
Merge branch 'release/1.2'