Some dependencies in a PR from an older branch broke the master build. The change adds the missing dependencies and updates some others. Signed-off-by: Stephen J Day <stephen.day@docker.com>
