Merge branch 'master', remote-tracking branch 'origin'
Add userquota and powerusers params to the UFC conf. Fix clean script