Feature/carrierwave including s3

WP [#16110](https://community.openproject.org/work_packages/16110)
Never use `unless` with `else`. Rewrite these with the positive case first.