Fix for NMS-6231 and NMS-6232 - Part II

The NodeDao in master is located on a different place.