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