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