Verify And Fix Indentations With Upstream

Several yaml files had BB indentation changes applied to them in the past.

Verify if the indentation changes are necessary. If the indentation is only cosmetic, sync the lines with the upstream indentations in order to make life easier on future merges.