Cloudbees and project fixes

Changes to project files and general build fixes.