b9312c63e1
Change-Id: Ife2ef3eb15f8435f29ffb4fb5912d00f68de0ff7 Partially-implements: blueprint remove-config-internal