Update to patch -17 at Apache svn upstream