Allow 'options' groups to apply to named module-sets.

This makes it more convenient to work with baseline configurations (that
are 'include'd) without changing the upstream configuration.

Still to do: add a warning when modules and module-sets end up sharing
the same name somehow.

BUG:365813
FIXED-IN:16.08