Fixed FB12057, warn when version gets long
Fixed JENKINS-25647
Fixed failing unit tests, JENKINS-25647
Finally Fixed JENKINS-25647