Remove the two remaining Apache licensed files until their license is fixed. Patch regressions that we had already submitted upstream -- resubmit
Toshio Kuratomi