Added remaining grains module functions to grains states
Removed duplicate functionality in grains states
Merge pull request #12565 from rallytime/grain_states

Added remaining grains module functions to grains states