modulesets: Update schemas to represent the state of the modulesets

These updates are not exhaustive, but do mean that (with some fixes to be
committed shortly) all moduleset files now validate against both schemas.

Helps: https://bugzilla.gnome.org/show_bug.cgi?id=696184