Support for user in VT (and per se cmdmod)
Merge branch 'salt' into develop

Conflicts:
	salt/modules/cmdmod.py