Move the contextRootMap to the ActivityService, it was in the Activity
Merge pull request #518 from fmoloney/ContextRootsRedone

Move the contextRootMap to the ActivityService, it was in the Activity