Lint Fixes

As per https://github.com/saltstack/salt/pull/16195#issuecomment-57045245