#29759 - Included newsletter signup in widget.
Resolved merge conflict.
code self review fixes