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