Removed conflict between core billing package and self-service RPMs so you can