[AMOS commit] MDL-20636 Fix a lot more coding style issues. Committed into Git: 2011-05-20 19:18 UTC