Change-Id: I4b4707b2d30175fcb93836edbe02c154a211c116 Partially-Implements: blueprint remove-docker-dir