Add missing external projects from CAF branch jb_rel_2.0.3.1