[DO NOT MERGE] use crm --wait to avoid races

Do not merge yet!  This needs quite a bit of testing as it's very intrusive.