Fixes issue(s) in saltstack/salt repo issue #11096
Fixes issue(s) in saltstack/salt repo issue #11096
reverted bad/unnecessary fix
Merge branch 'develop' of github.com:sandbender/salt into develop
re-removed :/
Merge branch 'develop' of github.com:saltstack/salt into develop
Adds support for REQUIRE <SSL, etc> to mysql_grants state - Satisfies request (issue) #5778.
Merge pull request #12238 from sandbender/adding_require_to_mysql_grant

Support for REQUIRE <SSL, etc> in mysql_grants state