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

This reverts commit 80c83f4a578e1ec0c8b5e439687716e365937c9a.