Move to released docker-java code and some formatting tweaks