[BACKLOG-832] - Kitchen hangs on MacOS
Merge pull request #778 from rfellows/5.2dev

[BACKLOG-832] - Kitchen hangs on MacOS