Port Ccp Trunk 2014.11.07 to git.
Resolve LICENSE conflicts.