Split and Merge PrivacyTrustCommManager with the privacy-protection
and trust-cloud bundles (Closes #1679)