BUG-648: use MapAdaptor

This converts the un-ordered nodes to using the MapAdaptor utility,
which should result in reductions to the amount of copies being made.

Change-Id: I9a427d97d18534a6fb76cb52e4fde59dcd54e9c4
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-648: use MapAdaptor"