Bump version to 2.1.0.
Merge pull request #5196 from PrideChung/master

Bump version to 2.1.0.