changed uris to corresponding osiam server due to the separation of auth-server and resource-server
Merge remote-tracking branch 'origin/master'