change "iam" to "token", because token server uses new path name
Merge remote-tracking branch 'origin/master'