Merge pull request #6366 from hulu/utils-not-util

fix typos of salt.utils in modules.win_disk
Merge pull request #6367 from JasonSwindle/patch-1

Updating Grains doc to show JINJA in Top file matching with grains. #6335
Merge pull request #6362 from KB1JWQ/Corey-fixcpuflags

Fix cpu_flags on MacOS
use connection_args in modules.mysql.processlist()
Merge pull request #6368 from l2ol33rt/useradd_fix_linux

Honor createhome: False when adding a user
Merge pull request #6369 from hulu/mysql-processlist-connection_args

use connection_args in modules.mysql.processlist()
Make virtualization detection on OS X less buggy/horrible
Merge pull request #6371 from KB1JWQ/corey-fixosxvirt

Make virtualization detection on OS X less buggy/horrible
Memory detection actually works on OS X now
Merge pull request #6372 from KB1JWQ/corey-fixmem

Memory detection actually works on OS X now
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
Add file.restore_backup, file.delete_backup

These functions allow you to restore a backup found with
file.list_backups, as well as remove unwanted backups.
add support for a2ensite,a2dissite
Document backup listing/restoring/deleting
make Mike happy