Downgrade chef, update rubocop (resolves conflict)

Change-Id: I61e05ae68ea2e23a276b7f2eea08d245544dfeb3