Merge "add osmclient build"