Follow changes from #9812
Follow changes from #9812

Conflicts:
	haddock-api/src/Haddock/Convert.hs

niteria/haddock,lamefun/haddock,mrBliss/haddock,haskell/haddock,randen/haddock,Acidburn0zzz/haddock,haskell/haddock,mrhania/haddock,Acidburn0zzz/haddock,adamse/haddock,haskell/haddock,idontgetoutmuch/haddock,mrBliss/haddock,Acidburn0zzz/haddock,esmolanka/haddock,jstolarek/haddock,mrhania/haddock,beni55/haddock,adamse/haddock,idontgetoutmuch/haddock,mrhania/haddock,beni55/haddock,esmolanka/haddock,Mistuke/haddock,JPMoresmau/haddock,JPMoresmau/haddock,randen/haddock,sboosali/haddock,idontgetoutmuch/haddock,niteria/haddock,mrBliss/haddock,Fuuzetsu/haddock,adamse/haddock,lamefun/haddock,Fuuzetsu/haddock,sboosali/haddock,Helkafen/haddock,JPMoresmau/haddock,randen/haddock,niteria/haddock,sboosali/haddock,jstolarek/haddock,lamefun/haddock,Helkafen/haddock,haskell/haddock,esmolanka/haddock,Mistuke/haddock,Mistuke/haddock,Fuuzetsu/haddock,Helkafen/haddock,beni55/haddock,Fuuzetsu/haddock,haskell/haddock