#156910 by asimmonds: fix code indentation problems introduced with new code in this development cycle; only whitespace changes