Fixed malformed include statement and illegally placed substitutions.
that did not expand in the output.
Fix output table column border alignment.
Incorporate patchset 1 comments.
Fix merge conflict.
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I85f5cd2ee86d0d70be7e35fd5b4cbfad872d6fe8
Signed-off-by: Ron Stone <ronald.stone@windriver.com>