Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I1e230de3fdd347612e6a6cdc89b7f9ebdcf75b73