Bug 1046020 - Include URI port in token server audiences. r=nalexander, a=sylvestre

========

https://github.com/mozilla-services/android-sync/commit/5b97feec9041d51bce9a8a03886af1206f41bce0
Author: Ben Curtis <androiddev@nosolutions.com>
    Bug 1046020 - Include URI port in token server audiences.

--HG--
extra : rebase_source : 9b92a16d960cc7bdc376cc70b3fa2db6786dc514
extra : source : 0fd0a2566a51b82b41dbb2dcb762005bf4f2148b