Merge branch 'hotfix/2.6.1'
Merge branch 'release/2.7.0'
Merge branch 'release/3.0.0-RC1'
Bump when.java to 3.0
Add WhenGuiceJerseyBinder and WhenHK2JerseyBinder
Bump mod.json includes to 3.0.0-SNAPSHOT
Add when.java example
Bump oss-parent-vertx to 1.5.0
updating poms for 3.1.0-SNAPSHOT development
updating poms for branch 'release/3.0.0' with non-snapshot versions
Merge branch 'release/3.0.0'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state