10/18 COOK Opscode Code Review


#1

** MERGE
COOK-3773
COOK-3717
COOK-3756

** FIX REVIEWED
COOK-2837

** OTHER
COOK-3480
COOK-1695
COOK-2954