Merge pull request #2645 from clumens/restart-clones
Fix various resource restarting problems in crm_resource