Merged apiclient and uaaclient