Add patches for 2.0.2_1 from Stephen Hurd

* See https://bugs.freebsd.org/bugzilla/attachment.cgi?id=144763&action=edit
Remove unnecessary files under files/
Merge branch 'pu-jj1bdx-xml' into next - incorporate 2.0.2_1 fix