Fixed code inconsistency with the teamcity plugin
Merge remote-tracking branch 'origin/develop' into develop
Remove unnecessary stuff from pom file.
Merge branch 'release/1.1.3'