Merge "Commit to master [RIFT 15737] Remove logic for deletion of folder on deletion...