Modified auth to work with unittest2 discovery.
Merge branch 'master' into ticket-17365-new

* master:
  Modified auth to work with unittest2 discovery.