Backport han.ruleset style fixes to S3_1/S3_0
Backport S3_2/main han.ruleset to S3_1/S3_0 (style corrections only), to provide baseline for #48714
Backport S3_2/main han.ruleset to S3_1/S3_0 (style corrections only), to provide baseline for #48714