[b2] Task #107: Adapted some classes to tycho 0.17.0