Consider old version of token without 'user_domain_name' attr

Closes-Bug: #1363515
Change-Id: I252b99fba3c48a7ed27af1b7da3b1cb037555eb8