Fix a quality flaw
SONARCS-463 Update rule keys with regexps & fix some quality flaws