fix conditional import xattr module
Merge branch 'xattr' into merge