Fixed: Awstats addon is broken (causing i-MSCP update failure...)
Refactoring + improvements +  small fixes
Small fixes
Merge branch 'upstream-master'