Fixing grant_option False being evaluated as a string and therefore True
Removed previous fix for grant_option False and am using salt.utils.is_true instead
Changed remaining 'if grant_option' to 'salt.utils.is_true(grant_option)'
added missing s
Merge pull request #7590 from llamallama/develop

Fixing grant_option False being evaluated as a string and therefore True