Merge branch '6.4' into 7.4

* 6.4:
  [FrameworkBundle][AssetMapper] Stop versioning the assets the mapper already resolved
  [Messenger] Drop the messages queued by a failed nested dispatch
  [HttpFoundation] Require the ffff marker when detecting IPv4-mapped addresses
  [HttpFoundation] Fix IpUtils::anonymize() for non-canonical IPv4-mapped addresses

# Conflicts:
#	src/Symfony/Component/HttpFoundation/IpUtils.php