Moved retrieval of shibb groups and datastream id to the point where the...

...y are needed to prevent them from being retrieved for unrelated attribute requests