core-4476 fix metadata editing.
core-4785 update delete msg for permanent deletes
Merge branch 'master' into STABLE