K 10 svn:author V 5 markj K 8 svn:date V 27 2016-05-03T23:46:01.455483Z K 7 svn:log V 102 MFC r295575, r295576, r295578, r295579, r295580: Various NDP cleanups. No functional change intended. END