updating poms for branch '1.2.1' with snapshot versions
Added a hotfix message
updating poms for branch'hotfix-1.2.1' with non-snapshot versions
Merge branch 'hotfix-1.2.1'
Updating develop poms to hotfix version to avoid merge conflicts
Merge branch 'master' into dev
Updating develop poms back to pre merge state