Check that master key is properly decrypted
Merge pull request #891 from drltc/check_master_key_decrypt

Check that master key is properly decrypted