Merge "Fix sonar issues in JscepCA"