Fix: tools: auto-merge was insufficient

The master and 2.0 branches had taken different approaches to crm_resource
clean-up refactoring in response to different issues. It was necessary to
combine the code more carefully.