r19633: Merge to lorikeet-heimdal, removing krb5_rd_req_return_keyblock in favour...