Restore group context to epr model which was removed inadvertently.
Properly report group in endpoint declaration.

Change-Id: I4eb68c8c3c6eaf9ebcd81eaeb688679f9884cb1f
Signed-off-by: Rob Adams <readams@readams.net>