[COOK-3697] Feature/hardening

https://tickets.opscode.com/browse/COOK-3697