Merge branch 'release/1.7' into develop
updating poms for next development version
Switched to original plugin
updating poms for release
Merge branch 'release/1.8'