Backoff when minion fails to connect

NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
Better detection still for OS X
Remove accidentally added file
fix spelling error
Merge pull request #6374 from michaelrice/develop

fix spelling error
Merge pull request #6373 from KB1JWQ/fixosvirt

Much better OS X virt detection now. It actually matches!
Merge pull request #6360 from kula/fix_5813

POTENTIAL FIX: Backoff when minion fails to connect
Merge branch 'develop' into with-pylint-pragmas