Merge pull request #3688 from nrwahl2/nrwahl2-fixes
Fix: tools: crm_resource returns error on failed schema upgrade