Added CLI examples to tls functions that were missing them
Merge pull request #14490 from rallytime/tls_cli_examples

Added CLI examples to tls functions that were missing them
Extend dot-in-pkg test to RHEL 5 as well
Merge commit
Merge commit, resolve conflict
Fixed code-block directives in gpg renderer
PyLint fix.
Merge pull request #14498 from whiteinge/doc-gpg-renderer-code-blocks

Fixed code-block directives in gpg renderer
Merge pull request #14495 from cro/rhel7_pkgtests2

Extend dot-in-pkg test to RHEL 5 as well
Merge branch '2014.7' into develop
Merge pull request #14500 from thatch45/develop

merge up 2014.7
Improving docs for salt.modules.apache
Merge pull request #14502 from nmadhok/improve-module-docs

Improving docs for salt modules