Merge stable-2.14 into stable-2.15

* origin/stable-2.14:
  Revert "Remove explicit dependency on commons-codec"

Change-Id: Iaa1dfe8c26c273fbcabc1b0730d479290fd7e0bd