Allows identity endpoint to be specified as URI

Deprecates the piecemeal identity URL buildup and
replaces with a simple uri configuration setting.
Gets rid of the /tokens path stuff that was not
necessary to have in configuration file.

Change-Id: I5e80177073f756781f813438d054fede2d6334a3
Merge "Allows identity endpoint to be specified as URI"