aufs: merge latest changes
Merge branch '3.14/aufs' into 3.14/master
Merge remote-tracking branch 'damentz/3.14/master' into 3.14/my