Merge branch 'fix-spec-failures-from-ci-support' into 'master'

Fix spec failures from ci support

See merge request !114



Merged-by: Simon Tomlinson <stomlinson@gitlab.com>
Approved-by: Simon Tomlinson <stomlinson@gitlab.com>
Co-authored-by: Jon Jenkins <jjenkins@gitlab.com>