s3-waf: merged auth subsystem changes from master