[SECURITY-1886] and [JENKINS-43183]

[balakine]

[JENKINS-43183] Include all builds into statistics
[SECURITY-1886] Fix more occurrences of this vulnerability

Testing done

Releasing previously tested changes

Submitter checklist

Beta Give feedback

1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
2. Ensure that the pull request title represents the desired changelog entry
3. Please describe what you did
4. Link to relevant issues in GitHub or Jira
5. Link to relevant pull requests, esp. upstream and downstream changes
6. Ensure you have provided tests - that demonstrates feature works or fixes the issue