Merge branch 'trunk' into graham-patch-WHIRR-673
WHIRR-673: Import repo key for RHEL/CentOS
WHIRR-673: Import repo key for RHEL/CentOS
WHIRR-673: Import repo key for RHEL/CentOS
WHIRR-673: Import repo key for RHEL/CentOS
Merge branch 'graham-patch-WHIRR-673' into graham-release-007