[FIXED JENKINS-14833] Fix a merge typo with a missing closing bracket
[FIXED JENKINS-14833] Fixed some build issues and now tested
Merge branch 'JENKINS-14833'