Adjusting jenkins to new directory structure.
Merge branch 'branch-1-0'