Merge branch 'release/4.8.4' into develop
Fix AMQP port on "old" ubuntus.
version bump[A
Merge branch 'release/4.8.5'