CA-145689 licensing updates

Copy of #1950 and #1957 for master.