Solved conflict.
Formatting Fixes.
The updates are done.
Comment addressed in https://review.opendev.org/c/starlingx/docs/+/834062
Signed-off-by: Elaine Fonaro <elaine.fonaro@windriver.com>
Change-Id: Ic24ce8dc22175892585e8b9f18726e0d0304a14f
(cherry picked from commit dd756aca3b)