Merge "Revert "Switch mistral to use authtoken configuration""