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