Merge "Couple of fixes to tempest/auth"