(FR #823) remove address info unless using AVS

Some forms had to be converted from div to table layout.

Introduces a sketchy precedent: optional inputs are hidden by css.

Change-Id: Ib05181a0dc2b33d25f1f58035f1535d80c923e14
Merge "(FR #823) remove address info unless using AVS"