Merge branch 'master' into Manager

# Conflicts:
#	backend/spacewalk-backend.spec
#	client/rhel/dnf-plugin-spacewalk/dnf-plugin-spacewalk.spec
#	client/rhel/rhn-client-tools/rhn-client-tools.spec
#	client/rhel/rhn-client-tools/src/up2date_client/hardware.py
#	client/rhel/rhnsd/rhnsd.spec
#	client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
#	client/tools/osad/osad.spec
#	client/tools/rhn-virtualization/rhn-virtualization.spec
#	client/tools/rhncfg/rhncfg.spec
#	client/tools/rhnpush/rhnpush.spec
#	client/tools/spacewalk-abrt/spacewalk-abrt.spec
#	client/tools/spacewalk-koan/spacewalk-koan.spec
#	client/tools/spacewalk-oscap/spacewalk-oscap.spec
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
#	java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
#	java/code/src/com/redhat/rhn/manager/user/UserManager.java
#	java/spacewalk-java.spec
#	rel-eng/packages/dnf-plugin-spacewalk
#	rel-eng/packages/dwr
#	rel-eng/packages/osad
#	rel-eng/packages/rhn-client-tools
#	rel-eng/packages/rhn-virtualization
#	rel-eng/packages/rhncfg
#	rel-eng/packages/rhnlib
#	rel-eng/packages/rhnpush
#	rel-eng/packages/rhnsd
#	rel-eng/packages/spacecmd
#	rel-eng/packages/spacewalk-abrt
#	rel-eng/packages/spacewalk-backend
#	rel-eng/packages/spacewalk-certs-tools
#	rel-eng/packages/spacewalk-java
#	rel-eng/packages/spacewalk-koan
#	rel-eng/packages/spacewalk-oscap
#	rel-eng/packages/spacewalk-proxy-selinux
#	rel-eng/packages/spacewalk-schema
#	rel-eng/packages/spacewalk-selinux
#	rel-eng/packages/spacewalk-setup-postgresql
#	rel-eng/packages/spacewalk-utils
#	rel-eng/packages/spacewalk-web
#	rel-eng/packages/yum-rhn-plugin
#	schema/spacewalk/postgres/packages/rhn_channel.pkb
#	schema/spacewalk/spacewalk-schema.spec
#	spacecmd/spacecmd.spec
#	spacewalk/certs-tools/spacewalk-certs-tools.spec
#	spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
#	utils/spacewalk-utils.spec
#	web/spacewalk-web.spec

backend/cdn_tools/cdnsync.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016--2017 Red Hat, Inc.
+# Copyright (c) 2016--2018 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or