lint
Merge branch '2014.7' into develop
Don't refresh a pillar to None
Merge pull request #14285 from cachedout/raet_pillar

Don't refresh a pillar to None
Docs for tls module.
Merge pull request #14289 from cachedout/tls_doc

Docs for tls module.