Merge pull request #1878 from apache/revert-1877-release2.4

Revert "Changed the license year in Release 2.4.0 branch"