Merge changes to configfile.c from c-implementation