Use FQDN in place of FQHN for consistency in sub_dict.
    
    For some reason lost to history the sub_dict in dsinstance and
    cainstance used FQHN instead of FQDN. This made upgrade scripts not
    work reliably as the variable might be different depending on context.
    Use FQDN universally instead.