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