Removed requirement for client-id-mapping in client-auth config as this is not needed when tenanted is set to false
Merge branch 'master' of github.com:rackspace/repose into malconis