AI-834 : made locationtype deletable.
Merge remote-tracking branch 'origin/beta' into beta