Merge "New JJB files for Docker container builds"