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
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
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
Fixed merging options dict
Merge pull request #12524 from rchrd/12523

Fixed merging options dict
avail_locations to nova driver
fix pylint errors for avail_locations for nova
Merge pull request #12528 from gtmanfred/cloud

avail_locations to nova driver
Fix misplaced parens in cmd.run

From log.warning('snip').format(shell) to
log.warning('snip'.format(shell)).

Also broke up very long line which probably contributed to this being hard
to spot.
Merge pull request #12530 from thusoy/cmd.run-fix

Fix misplaced parens in cmd.run
Hide rabbitmq_user passwords
Merge pull request #12531 from thusoy/hide-rabbit-pw

Hide rabbitmq_user passwords