[jgitflow-plugin]updating develop poms to master versions to avoid merge conflicts
[jgitflow-plugin]squashing 'master' into 'develop'
[jgitflow-plugin]Updating develop poms back to pre merge state