Merge 54204032-spring-boot-cli-container to master

[Completes #54204032]
Set OpenJDK to version thought to work with Spring Boot