Merge release/3.0 to release/4.0
[#17167] Merge release/3.0 to release/4.0

https://community.openproject.org/work_packages/17167
Merge remote branch 'ow/finn/release/4.0-merge' into finn/ruby-2.2