SONAR-4908 update xoo with tags
SONAR-926 remove remaining usages of deprecated qualifiers