added debug output to conversation-encryption test
temporaly disable tier 1 and 2
fix keyGeneration overlap
Merged 'dev'.