Merge "OverridableModuleBase shouldn't embed ModuleBase."

// Base module struct for overridable module types

type OverridableModuleBase struct {

	ModuleBase

	// List of OverrideModules that override this base module

	overrides []OverrideModule

	// Used to parallelize registerOverrideMutator executions. Note that only addOverride locks this

	// Adds the base module to the overrides property, if exists, of the overriding module. See the

	// comment on OverridableModuleBase.overridesProperty for details.

	if b.overridesProperty != nil {

		*b.overridesProperty = append(*b.overridesProperty, b.Name())

		*b.overridesProperty = append(*b.overridesProperty, ctx.ModuleName())

	}

	for _, p := range b.overridableProperties {

		for _, op := range o.getOverridingProperties() {