Imported jcifs 1.3.18
Merge branch 'upstream'