Backport #18346 to 2014.1

Backport #18346 to 2014.1

Conflicts:
	salt/modules/rvm.py