More refactoring and add new option to disable during state run
More refactoring and add new option to disable during state run

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt