Fix #10287 network.ip_address don't recognize interfaces with dashes in it's name
avoid shadowing module-level log in dockerio
Add RHEL6-specific upstart config files

RHEL6 doesn't use the net-device-up and local-filesystems targets,
meaning that if someone decides to use this upstart config then the
master/minion/syndic does not start on boot.

We don't deploy upstart configs in our RPMs, but this provides a working
upstart config file for those that wish to use it.
tomcat state: adding undeployed function
timezone module fixes for Arch
Merge pull request #10785 from terminalmage/rhel6-upstart

Add RHEL6-specific upstart config files
Merge pull request #10786 from ranl/develop

tomcat state: adding undeployed function
Merge pull request #10790 from tomashavlas/develop

timezone module fixes for Arch
Merge branch '10287-fix-dashes-in-interface-names' of git://github.com/dmyerscough/salt into dmyerscough-10287-fix-dashes-in-interface-names

Conflicts:
	salt/utils/network.py
Add inline function behavior tot he minion
First pass at refactoring Salt documentation.
Merge conflict and rebase.

Conflicts:
	doc/ref/renderers/index.rst
Wrapping up sub-TOCs.
Moving around Windows docs.
Now compiling cleanly except for GCE.
Fix GCE build errors.
Fix line length
Docs build cleanly! Yay!
Remove spurious heading. Thanks @gravyboat!
Merge pull request #10792 from cachedout/doc_toc

Documentation overhaul