Merge "Revert "Add scripts to enable Tycho build"" into idea133