Merge branch 'issue-450' into 'master'

Fix vm state changed to XY on None message

Closes #450

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

passed selenium