This way, the Ids for the matchers/wrappers are reused by importing
modules, and thus unfoldings are kept.

Also updates haddock submodule to accomodate tweaks in PatSyn representation

(cherry picked from commit ac2796e6)

Conflicts:
	utils/haddock