NXP-11145: Unbind server when renaming/deleting local root folder
Merge branch 'master' into 5.6.0