Merge pull request #5311 from hulu/copyedit-modular

copyedit modular_systems.rst
Merge pull request #5312 from hulu/patch-42

rm duplicate entries in dict literal, except for loop_interval
Use detect_kwargs in runner, fix #5259
Its a float
Disable the methods which require `_abcoll`.

Let's hope those methods are not used.
Make `salt.modules.xapi` python 2.6 compliant.

PEP-8 and formatting fixes.
Merge pull request #5305 from s0undt3ch/hotfix/xapi-python26

Make `salt.modules.xapi` python 2.6 compliant.
Merge pull request #5306 from s0undt3ch/hotfix/yumpkg-fix

We can't use `getCanonArch()` after all.
Merge pull request #5308 from s0undt3ch/issues/4912-ordereddict-fix

Switched to a fixed and more complete `OrderedDict` recipe. Fixes #4912.
modify a sentence for more accurate
Merge pull request #5316 from yinchuan/patch-1

modify a sentence for more accurate
Fix a bug in linux GPU vendor searches. With Intel integrated graphics, this function would return 'ati' as the vendor name because 'ati' was in the string Intel Corporation. Change the search to look at a list of strings to match a vendor name. This should work with any of the known vendors at this point in time.
Merge pull request #5320 from zmarano/gpu_fix

Fixes issue 5058: Fix a bug in linux GPU vendor searches. With Intel integrated graphics, ...
pkg/smartos : fix the manifest of salt-master to start@boot
Add refresh arg to group.getent()
Add refresh option to the other group.getent() instances
Enumerate removed groups in user.absent state, Fix #5310
modules/smartos_vmadm : add setmem(uuid, memory) function

This function identifies the VM type (OS -> realtime update, or KVM ->
reboot), and sets the correct amount of memory. Warning : there are no
checks against the CN : you could accidentally permit the VM to eat all
the RAM available on the baremetal...
modules/smartos_vmadm : fix a missing variable reference
Merge pull request #5321 from virtua-network/fix_smartos

pkg/smartos : fix the manifest of salt-master to start@boot