Code style clean-up: indentation

Some of the new code introduced this development cycle did not conform to the multiple-of-2 spaces for indentation. Attached is a patch to update the non-conforming code to the required 2-spaces indentation.
Have not included actions.(inc|module) as there is another open issue which will possibly fix any coding standards violations.