Merge remote-tracking branch 'origin/devel/master' into devel/master

Conflicts:
	zoe_master/backends/service_instance.py
6 jobs for devel/master in 2 minutes and 39 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Static Test
passed #14967
docs-test

00:00:46

passed #14965
pylint

00:00:54

passed #14966
unittests

00:00:52

15.0%
 
  Build
passed #14968
images

00:00:35

 
  Integration Test
passed #14969
api-test

00:00:49

 
  Deploy
passed #14970
mirror-github

00:00:20