fixed getContainerArchive() implementation
EncryptionInfo moved to a separate file
Encryption info usage (in progress)
Merge branch 'master' into ice-cream-sandwich