Fixed CrossPlatform test
Pulled in some patches from next.

Merged aee8d69 and ca2ede1 from the next branch.
Fixed two storage bugs.

SelfEncryptor flush is now a no-op, so drive has to close the
SelfEncryptor to force storage. While writing tests to verify, another
storage issue was fixed that occured on shutdown. Drive now forces
storage on shutdown.
Merge pull request #40 from vtnerd/MAID-402_FixStorageBug

Maid 402 fix storage bug