set of project class path fixes merged from CE