Merge "X509andChain.java: Fixed sonar issues"