> Is it really bait and switch if the company has a contributor/committer license agreement in place?

Even without the CLA, it was permissively licensed. Having your code rolled into a proprietary product is always a possibility you're consenting to when you contribute code under such a license.