merge grains_list state module to grains state module