Complete 558432f by dropping target-role on the chef resource too

Commit 558432f was not fully complete, as it's also important to drop
target-role from the chef resource, not just from the bit we're using to
check if we need to update the pacemaker resource.
Also drop target-role when updating clone, group and ms
Fix naming of variable