Bug 877380 - Update makeapi-client calls to find