Chip, et al: RPM Packaging is currently broken in 4.1 - this fixes CLOUDSTACK-1630 - which doesn't solve the breakage. But once packaging works again, this needs to be applied to fix upgrades.
797eb009e239d904c52de8c5be4cb0c82a63fea4 <-- applied on master
