Better trace for nested jinja errors
configurable salt-bootstrap url
Fixing failed unittest and making PEP compliant
Merge pull request #9565 from dmyerscough/develop

Fixing failed unittest and making PEP compliant
Merge pull request #9525 from makinacorpus/trace3

Better trace for nested jinja errors
Add pygit2 support to git fileserver backend
Add gitfs_provider to master config file template

Also moved a paragraph that seemed to be out of place
Add gitfs configuration parameters to master config docs

This commit adds the new gitfs_provider parameter, as well as several
other params for gitfs that were not documented.
Make gitfs prefer pygit2 if gitfs_provider not specified
Updated the digital ocean doc to fix some formatting issues regarding line length and indenting.
Merge pull request #9567 from gravyboat/develop

digital ocean doc fixes.
Fix port_bindings for docker.start function
Fix documentation related to docker port_bindings
Add not that python-hglib is required for hgfs backend
Don't ignore the workspace path option
Handle the xml unittest reports as a single, "chained" command.
Fix 7079 mount.mounted state leaves conflicting lines in /etc/fstab
Making PEP8 compliant
SmartOS esky build tooling

This includes:
Notes on how I created a build environment
The _syspaths.py that allows the esky build to be installed anywhere
"Template" SMF manifests and an install script to import them
A script for building both the esky zip and a deployable tarball
not env when minion not in the top.sls