Upgrade fixes

Addresses:

* https://tickets.corp.opscode.com/browse/OC-11572
* https://tickets.corp.opscode.com/browse/OC-11573
* https://tickets.corp.opscode.com/browse/OC-11571
* https://tickets.corp.opscode.com/browse/OC-11570