NodeStream still needs extra contrib upgrades.
Remove older version of entitycache in Commons to use newer from o_contrib.