Changes missed in the previous merge
Change versions to 1-java8-SNAPSHOT / 3-java8-SNAPSHOT