NDS-653: Extra endpoints listed on shutdown
NDS-653: Extra endpoints listed on shutdown

bodom0015/ndslabs,bodom0015/ndslabs,bodom0015/ndslabs,craig-willis/ndslabs,nds-org/ndslabs,craig-willis/ndslabs,craig-willis/ndslabs,craig-willis/ndslabs,bodom0015/ndslabs