Fixed bug #20322 : Display rules set to type=error even when suppressing warnings
Removed unused code and added TRAIT support (see bug #20307)