Zero diff refactor of config files

Change-Id: Ife23582ad22c54b6a11a8d7621db4f151014bfc2
2 files changed