Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix name of commons-net dependency

Change-Id: I18e9060ccdb3fe1cf380463b10463b4214dc29ee