Merge pull request #3869 from nrwahl2/nrwahl2-regression
Test: cts-cli: Make crm_diff test pass again