Updated common version in master to work around jgitflow bug
Merge remote-tracking branch 'origin/master' into develop
updating poms for 1.0.0.22-SNAPSHOT development
updating poms for branch'release-1.0.0.21' with non-snapshot versions
Merge branch 'release-1.0.0.21'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state