fixed up the hawtio code generation so that it deals with nested collection generics (e.g. headers on a WireTap) and uses the latest hawtio directory structure