Merge changes from topic "servicelocation"

* changes:
  Remove Support for Deprecated Location Updating
  Add Permissions checks for updateServiceLocation()