Added the changes to enable creating a package from the CEF 2062 branch