[nwam-dev] code review for 12245

[Anurag S. Maskey]

> ...at
>
> http://zhadum.east/export/ws/amaguire/nwam1-cr/webrev
changes look good.

Anurag