Specs for module_flavors

It also merges upstream/master, just to ensure an easy landing :-) (I should be more confident about the green button...)