APIKIT-182: When using the scaffolder, the main flow name and the api config name should be unique
Merge remote-tracking branch 'origin/master'