[nwam-dev] code review for 11417

[Alan Maguire]

...see:

http://zhadum.east.sun.com/export/ws/amaguire/nwam1-fixes/webrev/

thanks!

Alan