minor reversion patches
fixed updating roles
fixed broken handling of editing _self inclusions in hard templated cards