Merge branch '6.4' into 7.0

* 6.4:
  [Messenger] Revert "Resend failed retries back to failure transport "
  [Config][Messenger][Security] Don't turn deprecations into exceptions when unserializing
  [FrameworkBundle] Merge test from 5.4

Author: fabpot