TD-3546 Teamcity fixes