In case two constants/vars/rels are _not_ defined, force unification of universes (better semantics for axioms, opaque constants).
In case two constants/vars/rels are _not_ defined, force unification of universes (better semantics
for axioms, opaque constants).

Conflicts:
	pretyping/evarconv.ml

TheTypoMaster/coq,Lionel-Rieg/coq,SkySkimmer/coq,silene/coq,Lionel-Rieg/coq,aspiwack/coq,herbelin/github-coq,TOSPIO/coq,asr/coq,shindere/coq,JasonGross/coq,SkySkimmer/coq,maximedenes/coq,TheTypoMaster/coq,herbelin/github-coq,mattam82/coq,maximedenes/coq,shindere/coq,coq/coq,8l/coq,amintimany/coq,letouzey/coq-wip,william-lawvere/coq,Zimmi48/coq,gares/coq,SkySkimmer/coq,8l/coq,ale-f/coq,herbelin/github-coq,aspiwack/coq,ejgallego/coq,ppedrot/coq,amintimany/coq,barras/coq,gares/coq,mlasson/coq,JasonGross/coq,Ptival/coq,maximedenes/coq,TOSPIO/coq,gmalecha/coq,ejgallego/coq,ppedrot/coq,barras/coq,mattam82/coq,mattam82/coq,Zimmi48/coq,gmalecha/coq,letouzey/coq-wip,ppedrot/coq,ppedrot/coq,coq/coq,Matafou/coq,maximedenes/coq,barras/coq,8l/coq,letouzey/coq-wip,gares/coq,ppedrot/coq,pirapira/coq2rust,gares/coq,letouzey/coq-wip,jpdeplaix/coq,shindere/coq,coq/coq,william-lawvere/coq,asr/coq,ale-f/coq,asr/coq,TOSPIO/coq,silene/coq,aspiwack/coq,pirapira/coq2rust,jpdeplaix/coq,TheTypoMaster/coq,SkySkimmer/coq,pirapira/coq2rust,JasonGross/coq,gmalecha/coq,ale-f/coq,gares/coq,Matafou/coq,coq/coq,Matafou/coq,ejgallego/coq,amintimany/coq,Lionel-Rieg/coq,letouzey/coq-wip,william-lawvere/coq,Ptival/coq,JasonGross/coq,mlasson/coq,Ptival/coq,Zimmi48/coq,jpdeplaix/coq,mlasson/coq,maximedenes/coq,Zimmi48/coq,ejgallego/coq,silene/coq