use crm --wait to avoid races (stoney)

Port of #105 to stoney (`master`)