Merge topic 'TemplateFormatting'

6bf0055 STYLE: Format template<>
ENH: Update Cppcheck suppressions

Change-Id: I2f79082081fdc43eb792808c8857c4e9cfc772d4