Removing unused config key
Merge remote-tracking branch 'upstream/2.1' into 2.1
Update the configuration with the move from "modules" to "modules.active_modules"
Fix factory namespaces