Initial changes for the PrivacyRules datastructure. The hash function needs to be modified.

Change-Id: I6f1f10160dd2c9b1bde5158469bfa916009f1d30