Merge "Enable building with Tycho" into idea133