H1: Moved some classes back, excluded some webarchive-commons dependencies, fixed heritrix1-frontier unit tests.