[COOK-2843] Allow idempotent upgrade

http://tickets.opscode.com/browse/COOK-2843