Change-Id: I481e69afa98c8b61b8814dd6e6ec166447c7bd44 Partially-implements: blueprint remove-config-internal