Merge "Fix test dependencies for in-tree build" into stable-2.14