Auth module update 1

Separated Auth Types from Auth Modules; now supports any
combination of Auth Modules.

Change-Id: I425f2a1b5291bd8fe7532cd47665f4d6a646a8e1