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