Merge change I60413727 into eclair

* changes:
  Fix issue #2226370: Resource versions match with equality