Corrected indentation in private docker yaml codeblock x 3.
Fixed merge conflicts
Added 2x spaces before defaults: clause in yaml block
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I8c36f84e220666012e477b9c1936437a13e1230d
Signed-off-by: Ron Stone <ronald.stone@windriver.com>