Remaining deprecated usage of xml nodes

Ticket:	#4869