Merge branch 'smallville_fix' into 'master'

Manager: increase timeout for deploy and destroy

See merge request !408
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud