Merge "Fix ill-formed certificate request"