Add parser to jenkins.py
Put the parser variable in the correct place
Remove unused import
quote input in rbenv mod
Merge pull request #18439 from rallytime/jenkins_argparse

Jenkins argparse
pylint fix for quote rbenv mod
Force contents to a string in file.managed
Fix OrderedDict import in runners/lxc.py
Merge pull request #18464 from rallytime/pylinting

Fix OrderedDict import in runners/lxc.py
Merge pull request #18442 from jfindlay/quote_rbenv

quote input in rbenv mod
Merge pull request #18446 from basepi/filemanagecontentsstring

Force contents to a string in file.managed
Merge branch '2014.7' into develop

Conflicts:
	salt/states/file.py