aufs: merge latest changes
Merge branch '3.14/aufs' into 3.14/master