Fix lint issues. Simplify options building logic.
Fix inline code related lint issues.
Fix travis failures from merge of #9566
Merge pull request #9586 from terminalmage/gitfs-pygit2

Fix travis failures from merge of #9566
Merge pull request #9585 from s0undt3ch/develop

Lint Fixes
Fix some of the lint issues
Merge branch 'develop' of github.com:saltstack/salt into develop