Moved deleting the maintenace temporary file flag to very end of upgrade task
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas