Lead Convertor bug fixes.
Merge branch 'feature/409-address-mgmt' of https://github.com/SalesforceFoundation/Cumulus into feature/409-address-mgmt