Remove more javax.jcr.Node references from outside -kernel