CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize

Cleaner way of removing empty sub folders after ftp uploads
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas