remove unnecessary file delete
more robust handling if system permissions go wrong
remove duplicate cc_config
-fix infinite loop on invalid files
fix missing import
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
Merge branch '2.3.x' into 2.3.x-saas