tree a19765b3430c3c4c70d4d749dd0a00573b1f500b
parent 1063f18119fa0a50e6364d32d377320233a1a0fc
parent c9f3200b97124514c50a2f6eb045e1512a01e8dd
author Marco Miller <marco.miller@ericsson.com> 1550436056 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550436069 -0500

Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I44e6cabd7f0a414888013bec1eb1b979bed5b7d4