Merge pull request #12546 from rallytime/develop

Added deleted grain functionality to grains states
Fixes lint error, too many newlines.
Merge pull request #12547 from terminalmage/issue12505

Better documentation for outputters
Use the formated version attribute.
Regular `__version__` attribute must not include codename.

* Add `noc` and `sha` as `repr` attributes.
Update generated `salt/_version.py` file to use `__saltstack_version__`.
Merge pull request #12545 from aboe76/suse_spec_update

updated suse spec file for 2014.1.4
Make checking of running container optional.
Fix typo in _reinterpreted_state docstring
Merge pull request #12559 from Lothiraldan/patch-6

Fix typo in _reinterpreted_state docstring
Merge pull request #12558 from ticosax/check-is-running-container-optional

Make checking of running container optional.
More pylint
Pylint and (hopefully) Jenkins test fix.
Merge pull request #12552 from s0undt3ch/hotfix/transifex-updates

Update 'doc/.tx/config' - Build #43
Merge pull request #12554 from s0undt3ch/hotfix/fix-version-codename

Fix version codename exhibition
Merge pull request #12553 from cheuschober/fix_pillar_get_merge_when_missing

Fixes an oversight in the new modules.pillar.get merge parameter
Merge pull request #12551 from mikeslattery/patch-1

Add svn_pillar - pillars stored in SVN
Lint fixes for #12551 @mikeslattery
Break out ec2 create() into smaller functions
Temporary fix for custom runners to load