Merge pull request #12501 from cachedout/11143

Detect valid shells and warn
fix for when supervisor program names are name:* and not just name:
Add strftime formatting for ps.boot_time

This also fixes a bug in ps.boot_time which affects newer psutil
releases, where psutil.get_boot_time() has been renamed to
psutil.boot_time().

It also clears up some deprecation warnings on newer psutil versions by
preferring newly-added methods for ps.num_cpus and
ps.total_physical_memory.
Don't shadow boot_time function
Remove extraneous line
Fix missing delete after the protocol has been constructed otherwise two protocols are specified. Fix PEP8 indentation message
fix issue #12192 to return error message if show_image hit error
Merge pull request #12510 from dmyerscough/fix-missing-del

Fix missing delete after the protocol has been constructed
Merge pull request #12507 from terminalmage/issue12428

Add strftime formatting for ps.boot_time
Append 'sqlite_queue_dir' prepend_root_dir for salt.Master.prepare,
otherwise verify_env will complain no permission about default dir.
Merge pull request #12518 from crook/develop

Append 'sqlite_queue_dir' prepend_root_dir for salt.Master.prepare, otherwise verify_env will complain no permission about default dir.
Add versionadded directive to vsphere cloud driver
Merge pull request #12520 from terminalmage/issue12500

Add versionadded directive to vsphere cloud driver
Update supervisord.py

added name check to start() method.
Update supervisord.py

Looks like if you have multiple procs, you still need ':' at the end of starting supervisord.  added loging to strip '*' at end of a supervisord start
Initial commit of boto_asg execution module.
Initial commit of boto_asg state.
Fix Issue: #12422 blockreplace adding blank lines

file.blockreplace introduced an unwanted final new line when given
multi-line content due to split() behaviour.
Fixed merging options dict
Merge pull request #12524 from rchrd/12523

Fixed merging options dict