Pylint fix
Merge pull request #15942 from jacksontj/develop

Change timeout for CLI returns
Merge pull request #16060 from cachedout/ioflo_doc

Start ioflo docs
Some improvements to parsing cmd output in list_

* Properly ignore "header" lines which indicate output in "CHS" or "CYL"
* Raise salt.exceptions.CommandExecutionError on unexpected parsing
	failures
* Always check for correct len of cols array before unpacking by index
More test coverage for salt.modules.parted

* Full coverage for "list_" method
Revert "Change timeout for CLI returns"
Merge pull request #16076 from saltstack/revert-15942-develop

Revert "Change timeout for CLI returns"
Minor edit for lint
Merge pull request #16062 from rallytime/fix_ec2_tests

Fix the ec2 cloud provider tests
Rework of more_time feature

In the past this feature has basically checked returns, pinged minions if they were still running the job, then returning once the job was no longer run remotely. This has caused some issues with race conditions if the minion or master are busy (and the time between minion done, and master recieved gets large).

This changes the behavior of the "wait" mechanism. The intent of this feature is to wait for the job return from all minions the job went to. To accomplish this we fire the job, then check the returns. If the initial returns are what we wanted/expected we break. If it isn't we will ping all targets and see if its still running. If more minions return, we merge them into the list of minions we are waiting for. We will timeout the job once all minions have stopped running the job and TIMEOUT seconds have passed (since the slowest minion)
Pylint cleanup
Initial interaction with F5 Load Balancers
Start pinging minions after TIMEOUT, instead of immediately
Add master opts to the loader

This allows us to create objects in the wrapper classes that are run
purely on the master opts
Improve formatting

Bullet points look better here than an indented section with an enormous
font.
Add a timeout to get_event_iter_returns, the old implementation won't timeout if the event buss is relatively busy
Fix #16064
Pylint fixes
Add __master_opts to pylintrc exclusions
Merge pull request #16081 from terminalmage/docs

Improve formatting