Errata deps

Patchset includes a few related changes primarily to cleanup module inclusion and improve errata module