Fix Ubuntu build: reinstate -Werror

Robert Schmidtrequested to merge
fix-ubuntu-build into develop

See commit messages for more details.

Merge request reports