https://www.pivotaltracker.com/story/show/69631978
Client ID must be validated when we validate a token during authentication.
Merge branch 'bug/invalid-client-cfid-1127' into develop