Merge "Fix directory check in UserCertificateSource"