DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ am:...

DO NOT MERGE: fix for the XPath nodeTab use-after-free bug from nmehta@ am: 01ad0c65 am: 6321519b am: 6188da58  -s ours am: a3da3e0a  -s ours am: b8d635fa am: 368f921e  -s ours am: 981a28ea am: 38ae5ff7 am: 4a9e85f6 am: b47b07cd  -s ours am: d5b16160 am: da50e0de am: 2c4f7439 am: 0d760d8c
am: 5bc0b2aa  -s ours

Change-Id: I81c09a6500794de27efe2b682062c06755011198