Allow idempotent upgrade

This is for http://tickets.opscode.com/browse/COOK-2843