- Resolved merge conflict.
- Removed lines from original ks-addon.cfg.
- Updated the ks-addon.cfg file example for installing-a-subcloud-without-redfish file.
- Updated the ks-addon.cfg file example for installation-prereqs file.
Change-Id: I98114f0742a89dcb2daa2a11efa9af3b43876143
Signed-off-by: Elaine Fonaro <elaine.fonaro@windriver.com>