Several independent changes

Dmitri Naumovrequested to merge
endJunction/ogs:SmallFixes into master

Mostly refactorings. See individual commit messages for details.

Edited by Dmitri Naumov

Merge request reports