Make sure master_uri is set correctly when using client api
Merge branch 'salt_transport_fix_1' of git://github.com/cro/salt into cro-salt_transport_fix_1

Conflicts:
	salt/config.py