Merge branch '5.4' into 6.0

* 5.4:
  [Messenger] Fix typo in option name user->login

Author: javiereguiluz

messenger.rst

@@ -1148,14 +1148,14 @@ The transport has a number of options:
                                               calls.
 ``host``                                      Hostname of the AMQP service
 ``key``                                       Path to the client key in PEM format.
+``login``                                     Username to use to connect the AMQP service
 ``password``                                  Password to use to connect to the AMQP service
 ``persistent``                                                                                   ``'false'``
 ``port``                                      Port of the AMQP service
 ``read_timeout``                              Timeout in for income activity. Note: 0 or
                                               greater seconds. May be fractional.
 ``retry``
 ``sasl_method``
-``user``                                      Username to use to connect the AMQP service
 ``verify``                                    Enable or disable peer verification. If peer
                                               verification is enabled then the common name in
                                               the server certificate must match the server