Keeping up with evolving docker-java

See individual commit messages.