Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Add initial end-to-end functional test scenarios

Change-Id: I0cbff5cbec0f9d14c002cabd6888a451daba4a9e