Hotswap Lipo Circuit for Tegra TX2 Dk
That circuit is roughly correct, however you don't want to use Zener diodes. Zener diodes are intended to be driven reverse biased, which this application doesn't need/want. Instead, look for a Schottky diode. These diodes have a relatively low forward voltage meaning lower power loss in the diode.