Merge Zimbra-8.0 branch into master

This is the initial version re-architected and modified to work with Zimbra 8.0.