merge ConfigurationOfMetacello-dkh.754 and ConfigurationOfMetacello-ChristopheDemarey.754