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