Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add dependency on commons-lang3

Change-Id: Ib9130df472b5a58b0e28223445720b43e9f17142