Merge "Clean up jjb and update csit jobs for oof Switching the build-nodes for docker...