Make expandResourceShortcuts part of RESTMapper on client