Fix some inconsistent indentation

Some places used 4 spaces instead of 2
Merge pull request #3151 from kchmck/master

Fix some inconsistent indentation