Remaining deprecated usage of xml nodes

Ticket:	#4869
(cherry picked from commit 6055896d96bc5d42b52862a7971f8310099ff9c9)