Bug#1135703:

[Christopher Obbard]

Control: forwarded -1 https://gitlab.com/lava/lava/-/merge_requests/3187

This PR is much better.

PS: Not sure I want to apply this as a patch until upstream merges it, since it 
contains database migrations and those may change.