Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Revert "Remove explicit dependency on commons-codec"

No-op merge because we don't want to reintroduce the dependency
on commons-codec in this branch.

Change-Id: Idc26e3c25667ea9d22c5b5ca9f8c61c382fdd87b