Reload grains when reloading modules for states
Merge pull request #15136 from lyft/reload-grains-with-modules-for-states

Reload grains with modules for states