CLOUD-106 fix usages rest endpoints and the underlying services