Merge "Add missing VIP definitions into -no-tunneling env file"