tree 2af8741aa023ff8d99ee9637fc8881181d389683
parent 8f6f242cfec05a5364206866eb62d0f3cba913af
parent 305d882d76529d5d4589227b754522b3ddeeecbf
author Marco Miller <marco.miller@ericsson.com> 1550436111 -0500
committer Marco Miller <marco.miller@ericsson.com> 1550436213 -0500

Merge branch 'stable-2.16'

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

Change-Id: Ic9aa28c070b50fe670029ab001f19fa974a52176