Fixed yaml formatting errors.
Merge branch 'icehouse'