Merge "Improve tracing for java.security.debug=certpath"