Merge pull request #1509 from apache/tristan/license-freedom

Replace some materials which we don't have formal ICLAs signed for