Merge pull request #5252 from JKingsnorth/CRM-10551

CRM-10551: Allow deletion of blanked location-based fields edited via a profile

diff --cc CRM/Contact/BAO/Contact.php
Simple merge

diff --cc CRM/Contact/Form/Inline/Website.php
Simple merge

diff --cc CRM/Core/BAO/Block.php
Simple merge

diff --cc CRM/Core/BAO/Website.php
Simple merge