Uncommenting user directory removal
Merge branch 'refs/heads/f/rpm'