Merge pull request #15711 from hulu/lxc-typos

fix typos in lxc execution module
Merge pull request #15703 from loz-hurst/patch-2

Fix broken back ticks in 68301c4
Revert "Revert "Re-enable test run SLS""

This reverts commit fcfa1a244e2b04369d87112c729ce8dda742a979 and
re-enables tests in jenkins.py. They had been left commented out while I
was testing.
Starting on function docs for key.py
Merge pull request #15725 from terminalmage/re-enable-tests

Revert "Revert "Re-enable test run SLS""
Add another doc string
Merge pull request #15629 from cachedout/issue_15608

Pass user info with the syndic
Merge pull request #15667 from cachedout/issue_13146

Fix auto-order problem in state.template
Merge pull request #15666 from rbjorklin/fixed-tomcat.fullversion

Fixed tomcat.fullversion on Ubuntu in salt/modules/tomcat.py, issue 13456
Merge pull request #15670 from eliasp/2014.7-salt.states.dockerio-proper-error-output

states.dockerio: Show the error instead of the container name again.
Merge pull request #15682 from nmadhok/fix-state-archive-example

Correcting example in salt.states.archive.extracted and specifying tar_options
Merge pull request #15683 from SEJeff/fix-network-managed-state-rhel7

Add the ifcfg-* template for 'network.managed' to work on RHEL7
Merge pull request #15691 from mickep76/develop

Added reference to Pepa doc. and in-line rst documentation
Remove unused kwarg from _check_state_return
Rename --dest-dir to --build-dir

``--build-dir`` is a more accurate name. ``--dest-dir`` seems to suggest
that this is where the packages ultimately end up. While it's true that
the packages do end up within that directory, they are copied to the
artifact directory, from which they are ultimately retrieved by the
jenkins master.
Add SRPM to build artifacts for automated RPM builds
Fix encoding issues in nested output

This fixes #15542
No need for _formatfor().
Merge pull request #15731 from terminalmage/buildpackage-tweaks

Two tweaks to automated RPM builds
Merge pull request #15676 from rallytime/ec2_cloud_tests

Ec2 cloud tests