- Fix discharge adding spurious global constraints on polymorphic universe variables
appearing in assumptions.
- Fixes in inductiveops not taking into account universe polymorphic inductives.

Conflicts:
	library/declare.ml
	library/decls.ml
	library/decls.mli
Merge ../../coq/git into trunk