MP1-4282 : Fix exception when double name in folder setting.
Merge branch 'MP1-4282-BUG-Fix_exception_when_double_name_in_folder_setting' into MP1-1.6.0-Pre