fixed more sonarqube violatons (cnf constraints)

2 jobs for master in 44 minutes and 41 seconds (queued for 3 seconds)