Major rework to support new eHealth rules (partial)

git-svn-id: https://etee.svn.codeplex.com/svn@27572 555e8bc2-ad3d-4a22-a156-a42dcab9bd6f