[FIXED JENKINS-14833] Fixed some build issues and now tested