Catch up upstream

Upstream patched this issue yesterday, so we can probably catch up with upstream and stop using the cron from rackspace-cookbooks. The first step is to catch up our copy. Then deprecate it?

NOTE: This throws away our fix, so we're back on upstream. We will need to merge it on the commandline.