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