Merge "ACL mask added for cert_path"