address bashate style violations

these were mostly inconsistent indentation, there were a couple of
blocks that came over with 2 space indents, even though the prevailing
indent is 4.

One issue found with function foo() {, again the prevailing style is
function foo {, so enforcing that rule seems appropriate.

Change-Id: I5761064a758eddccd27979e2a71925e004e9ccc8
Merge "address bashate style violations"