Merge branch 'release/4.8.3' into develop
Fix the broker_api URI with AMQP.
version bump
Merge branch 'release/4.8.4'