CLOUDSTACK-6927: Ensure that any rules get cleaned if required