BUG:5179 Fixing the jenkins Merge