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

This reverts commit 726e1a49bd40d98ffcfba760a08c503b096c79bd.

It is not desirable to put vcldemo and icontest into installation sets.