CC-5808: Fixed breakage at shutdown
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas