Upgrade Tycho to 0.21
Update feature to 2.0 due to new license
Merge branch 'rc'
Updated tycho version to 21
Removed citd from artifact name