[#1732] astyle cleanups, mostly namespace indentations