tree ff8701ba253111b589d770c5f2cd0826eda3110c
parent 2f02e59753c265030e7cfdf81b08e42a9c9d8ed0
parent 8f96a65f045345e66e8235c237679ebfc09ecbb4
author Marco Miller <marco.miller@ericsson.com> 1589810282 -0400
committer Marco Miller <marco.miller@ericsson.com> 1589810282 -0400

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  e2e-tests: Replace FileBasedFeederBuilder with FeederBuilder declaration

Change-Id: I71ab830bdc96e6b822b71fba67c51939c347961f