Merge branch 'feature/import-db' into develop
Artichoke config file name now considers branch

In order to allow one configuration for each branch the config file is
saved considering the given branch.
Merge remote-tracking branch 'origin/feature/fabric_branch_configuration'