drqs-40608146: Additional format fixes in 2.17 for 'doxygen' conversion.

Import internal commit e42ace75d2fe3e5b4b623c64f124dfaa4a304a87
[APPROVAL] review/format_errors_cause_doxygen_problems-drqs-40608146 to master