Update to new two-way certificate for AAF