Merge branch 'release/4.8.5' into develop
fix the amqp flower broker again
version bump
Merge branch 'release/4.8.6'