Fix inconsistency with auth_tok/auth_token

Switch to using auth_token instead of auth_ok

Fixes LP# 1152826

Change-Id: I56569c1fa8f29b0474440c40644729d436d41c7b
Merge "Fix inconsistency with auth_tok/auth_token"