Apply xsconsole.hg csets 344533b9b029 and 46ffb080583b for 64 bit use