Fix edge case when rel path changes from file to dir

This fixes an edge case in gitfs where a path that once was a file is
now a directory.
Merge pull request #11281 from terminalmage/issue11181-2014.1

Fix edge case when rel path changes from file to dir (2014.1 branch)
Cherry-pick #11308 to 2014.1.1
Use the correct opts
Merge pull request #11309 from basepi/cp11308

Cherry-pick #11308 to 2014.1
Yamlify syntax is not "old", remove comment
Fix kwarg parsing

This fixes a regression in develop where CLI kwargs are not passed
through yamlify_arg(), which result in salt not being able to load data
structures from the command line.
Pre-parse CLI args
bump to 2014.1.1
Bypass the missing jid files
Updated packaging script for RPM
Merge pull request #11407 from cowyn/update-salt.spec

Updated packaging script for RPM
Merge pull request #11406 from cowyn/bypass-missing-jid-files-2014.1

Bypass the missing jid files
Fix service restart over salt
Fix traceback when os_fn path does not exist for overstate
Yamlify fixes

This allows None to be properly loaded, as well as fixing the loading of
floats.
Merge pull request #11335 from terminalmage/kwargparsing-2014.1

Properly pre-parse args and kwargs (2014.1 branch)
The git url pillar value needs to be quoted
Fix the comma placement
Merge pull request #11450 from s0undt3ch/2014.1

The url needs to be quoted