changes to use the 3 MAC system, one MAC for read access, one for write access, and a third for end-to-end integrity.
Merge origin/master