[nwam-dev] code review for 12084/12115

[Alan Maguire]

...at

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

Thanks!

Alan