GTNPORTAL-3209: Added Node Mapping validator plus minor fixes and improv...

...ements