Merge pull request #13817 from rallytime/cloud_extends_docs

Clarify cloud configuration extends behaviors
Merge pull request #13809 from nmadhok/fix-docker-push-module

Fixed the behaviour of docker.push module
Merge pull request #13814 from s0undt3ch/develop

Update to latest bootstrap-script.sh, v2014.06.28
Merge pull request #13815 from cachedout/mysql_handling

Exception handling in mysql module
Merge pull request #13816 from whiteinge/match-filter_by

Added a filter_by function to the match module
Merge pull request #13818 from nmadhok/fix-minor-state

Putting **kwargs as function arguments
Removing unnecessary lines
Use code-block instead of double-colon + indent

The new sphinx style assumes that indented examples preceded by a
double-colon are python. This changes he main walkthrough page so it
uses a bash code-block in these areas, to be more accurate.
Fixing pylint violations in dockerio
Fixing more pylint violations in dockerio
Merge branch 'develop' of github.com:nmadhok/salt into create-docker-push-state
More pylint violations in salt/client/ssh/state.py and salt/states/dockerio.py
Fixing documentation(changing tag to image)
Merge pull request #13821 from terminalmage/docs

Use code-block instead of double-colon + indent
Update best_practices doc for code block issues.
Fixing pylint violations
Merge branch 'develop' of https://github.com/saltstack/salt into create-docker-push-state
Fix example for keyring driver
Passing tag correctly from state to module function
Removing unused import causing pylint violation