Merge "Fix sonar issue of artifactbroker"