Move Licensing to CC 4.0

Resolve licensing discrepancies, move to CC 4.0 everywhere.