Pulled in some patches from next, and stripped whitespace.

Merged aee8d699f86afc3eb0809c51cf4ac530e986728b and
ca2ede1d36ca59b92c6c8dc3f733b4052b99f627 from the next branch to verify that
shutdown issues were unrelated to drive_v2.