fixed more sonarqube violatons (cardinality constraints)

2 jobs for master in 15 seconds (queued for 7 seconds)