Includes additional SelfEncryptor Close calls, disabled tests referred to in MAID-140 and resetting of cross platform test data.