https://bugzilla.redhat.com/show_bug.cgi?id=1014099 - False warnings on ExpiryQueue not being deployed, also improving https://bugzilla.redhat.com/show_bug.cgi?id=1014103