Fixes for Hawk PR

* Adding license headers
* web.xml clean up