Nbconvert latex markdown images2

New PR to address #4191 (previous PR #4192 had fallen too far behind master)