CEP-918: Correcting license files - CEP; and fixing CEP-919