CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
Merge branch '2.5.x' into saas
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas