Merged with default.

--HG--
branch : stable
Merged with default.

--HG--
branch : stable
Chef now returns expected error codes.

--HG--
branch : stable
Merged with stable.