Osng 471

This pull request contains all changes for userstory #OSNG-471.
think about using a UriBuilder (OsiamConnector/AuthService/line231