Release 1769

We were combining address_line1 and address_line2 for the street field, but we already show address_line1 in the building field, so if you went through the experience registration process multiple times (matching back) you ended up with your building number prepended to the address again (and again).