Fudge for rsync normalize issue where hostname is converted to IP address
Cotton fix for rsync
vm_task merge
fixes to use env.gateway and moved get_pillar