Updates to 2.6 Service docs

First few changes for Services in 2.6. 

More doc updates later in the week.
Yeah, I remember some discussion happening too. @rohitsinha54 is there some terminology we've agreed to?