Merge "Change config-file to config-dir for g-api start"