Merge branch 'stable-3.1'

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

Change-Id: Icf37d145457de7e96663980207bdc708a8180db4