Merge pull request #2204 from kgaillot/2.0
Fix: tools: revert some changes in crm_resource NULL checks