TLPORTAL-104: have wrapper code reflect RestClient code when possible