Merge branch 'merge-debian-master' into 'collabora/master'

debian/changelog

debian/control

debian/obs-apache2.conf

debian/obs-api.postinst

debian/obs-api.postrm

debian/patches/CVE-2017-5188.patch

...ora/Add-support-for-md5-and-sha256-cypted-passwords.patch

...ollabora/Add_--ignore=unusedarch_to_reprepro_params.patch

...bora/Add_global_configuration_for_a_shared_reprepro.patch

...Config-Make-every-architecture-its-own-relsync-pool.patch

...bora/BSConfig-Read-a-BSConfig.local.pm-if-it-exists.patch

...ra/BSConfig.pm.template_include_a_skeleton_reprepro.patch

.../Correct-reprepro-argument-to-match-current-version.patch

...de_ddebs_in_reprepro_too_and_fix_inclusion_of_udebs.patch

...nary-uploads-in-architecture-dependent-subdirectori.patch

...ora/Seperately_include_debs_and_udebs_into_reprepro.patch

...ackend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch

...ra/backend-Support-https-urls-for-package-downloads.patch

...bs_publish_improve-logging_for_reprepro_invocations.patch

.../publish_Also_accept_udebs_into_reprepro_repository.patch