Fixes #4062: Prevent an upgrade failure in case of a property modification reverted by a package upgrade