Eliminate use of problematic EntityHolder class from ServiceResource and UserResource.
Some fixes to NodeRegistry and based on testing today.