Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir""
Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir""

This reverts commit b64caa8ad85d951c74e1c84096802997340c8e1b.

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core