Upgrade to tycho 0.21