Merge "Configure tep-ip for genius auto tunnels"