Adding ability to manage mounts but not mount immediately following the state run.
Merge pull request #13104 from garethgreenaway/9589

Change to mount state