Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix test dependencies for in-tree build

Change-Id: I9e63aaf704a5acc310fb44f720b73f78edbff52d