Backport 17 factories

Backported the 1.7 factory config.yml , however I can't update the Python config generator scripts to include the new factory types as apparently my Python version can't run them. Is anyone still using those scripts?