RTGOV-434 Consolidate remaining datastore epn node into existing ootb ep...

...n