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