Merge "Fix usage of NotImplementedError exceptions in auth classes"