Get most auth cucumber tests passing
Merge branch 'auth_compat'