Fixed an issue where enabling `grain_opts` in the minion config would cause
some core grains to be overwritten.