Merge pull request #2 from chibenwa/trunk

Retire Apache James HUPA