whitespace consistency
Merge branch 'master' into contrail