Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix test dependencies

Change-Id: I2e02db7984cb105ae950e8ed8342d52a8e09acf9