   Patched to match the RC branch.
   Patched to match the RC branch.

mmundy42/auth,PATRIC3/auth,kbase/auth_service,kbase/auth,kbase/auth_service,kbase/auth_service,olsonanl/kbauth,PATRIC3/auth,mmundy42/auth,kbase/auth,kbase/auth,kbase/auth,kbase/auth_service,PATRIC3/auth,olsonanl/kbauth,olsonanl/auth,olsonanl/auth,kbase/auth,olsonanl/auth,olsonanl/kbauth,olsonanl/auth,PATRIC3/auth,olsonanl/kbauth,mmundy42/auth,PATRIC3/auth,mmundy42/auth,olsonanl/kbauth,olsonanl/auth