Removed obsolete role teamcity_agent.
Resolved conflicts.