Make visual coding style consistent

Addresses comments on https://review.openstack.org/#/c/35407/
without rebasing the entire chain.

Change-Id: Ia24ff06dd4befc1af6f9479afdfbeb5bb06387ce
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Merge "Make visual coding style consistent"