Upgrade from 4.0.9 to 4.0.10.
Update CONFLICTS.

<ChangeLog>

Redis 4.0.10 fixes a number of important issues:

• Important security issues related to the Lua scripting engine. Please check https://github.com/antirez/redis/issues/5017 for more information.

• A bug with SCAN, SSCAN, HSCAN and ZSCAN, that may not return all the elements. We also add a regression test that can trigger the issue often when present, and may in theory be able to find unrelated regressions.

• A PSYNC2 bug is fixed: Redis should not expire keys when saving RDB files because otherwise it is no longer possible to use such RDB file as a base for partial resynchronization. It no longer represents the right state.

• Compatibility of AOF with RDB preamble when the RDB checksum is disabled.

• Sentinel bug that in some cases prevented Sentinel to detect that the master was down immediately. A delay was added to the detection.

• Other minor issues.

</ChangeLog>