Updating text in address settings page.
Second part of address settings ui redesign.
Couple more string changes.
Merge dev into feature/702-address-settings-ui
Merge dev into feature/702-address-settings-ui
Added back two previously deleted labels as depricated labels since we
can't delete them from a released managed package
Merge pull request #725 from SalesforceFoundation/feature/702-address-settings-ui

Feature/702 address settings ui
Merge dev into feature/312-Future-Usage-Cleanup