Steve Roud's folk song index seems to have the two songs well separated, and "No, John, No/ Spanish Merchant's Daughter/ Twenty, Eighteen" is Roud #146. He notes about 2 dozen texts in all. No broadside text close to traditional versions seems to be known.